Merge pull request #35 from tablexi/develop

Promote Develop to Master

Author: Lloyd Philbrook

.circleci/config.yml

@@ -0,0 +1,66 @@
+version: 2.0
+jobs:
+  build:
+    docker:
+      - image: ruby:2.4.3
+    steps:
+      - checkout
+
+      - type: cache-restore
+        key: gemfile-v2{{ checksum "Gemfile.lock" }}
+
+      - run: bundle install --path ~/bundle
+
+      - type: cache-save
+        key: gemfile-v2{{ checksum "Gemfile.lock" }}
+        paths:
+          - ~/bundle
+
+      - run: bundle exec rake berkshelf:setup
+
+      - run: bundle exec berks install
+
+      - run: bundle exec rubocop
+
+      - run: bundle exec foodcritic .
+
+      - run:
+          command: bundle exec rspec
+          no_output_timeout: 1800
+  release:
+    docker:
+      - image: ruby:2.4.3
+    steps:
+      - checkout
+
+      - type: cache-restore
+        key: gemfile-v2{{ checksum "Gemfile.lock" }}
+
+      - run: bundle install --path ~/bundle
+
+      - type: cache-save
+        key: gemfile-v2{{ checksum "Gemfile.lock" }}
+        paths:
+          - ~/bundle
+
+      - run:
+          command: |
+            export GITHUB_REPO="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
+            export GITHUB_TOKEN=$CHANGELOG_GITHUB_TOKEN
+            export VERSION_MINOR=0
+            export VERSION_PATCH=$CIRCLE_BUILD_NUM
+            bundle exec rake release:github release:chef_server
+
+workflows:
+  version: 2
+  test_and_bump:
+    jobs:
+      - build
+      - release:
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - master
+                - develop

.gitignore

@@ -9,7 +9,6 @@ client-config/*.pem
 client-config/*.rb
 
 .rvmrc
-.ruby-version
 .ruby-gemset
 
 .bundle
@@ -32,4 +31,5 @@ Berksfile.lock
 .kitchen.local.yml
 
 cookbooks/*
-batali.manifest
+
+VERSION

.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
   Exclude:
     - vendor/**/*
     - cookbooks/**/*
+  TargetRubyVersion: 2.4
 
 ClassLength:
   Enabled: false
@@ -20,9 +21,20 @@ LineLength:
   Enabled: false
 MethodLength:
   Enabled: false
+Metrics/ModuleLength:
+  Exclude:
+    - "**/*_spec.rb"
+Metrics/BlockLength:
+  Exclude:
+    - "**/*_spec.rb"
 SignalException:
   Enabled: false
 WordArray:
   Enabled: false
-Style/Next:
+Style/FrozenStringLiteralComment:
+  Enabled: false
+# Use until migration to classes
+Metrics/BlockLength:
+  Enabled: false
+Metrics/BlockNesting:
   Enabled: false

.ruby-version

@@ -0,0 +1 @@
+2.4.3

CHANGELOG.md

@@ -0,0 +1,3 @@
+# Change Log
+
+For all future changes, see https://github.com/tablexi/chef-ffmpeg_amazon/releases.

Gemfile

@@ -1,24 +1,30 @@
 source 'https://rubygems.org'
 
-gem 'rake'
+ruby File.open(File.expand_path('.ruby-version', File.dirname(__FILE__))) { |f| f.read.chomp }
 
-group :lint do
-  gem 'rubocop'
-  gem 'foodcritic'
-end
+gem 'berkshelf'
+gem 'chef', '~> 12'
+gem 'cookbook_release', git: 'git@github.com:tablexi/chef-cookbook_release_tasks.git'
 
-group :unit, :integration do
-  gem 'berkshelf'
+group :dev do
+  gem 'chef-validation'
+  gem 'chefspec'
+  gem 'foodcritic'
+  gem 'rubocop'
 end
 
-group :unit do
-  gem 'chefspec'
-  gem 'rspec-expectations'
+group :guard do
+  gem 'guard'
+  gem 'guard-foodcritic'
+  gem 'guard-kitchen'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+  gem 'ruby_gntp'
 end
 
-group :integration do
-  gem 'test-kitchen'
-  gem 'kitchen-vagrant'
+group :kitchen do
+  gem 'chef-zero'
+  gem 'kitchen-docker'
   gem 'kitchen-ec2'
-  gem 'serverspec'
+  gem 'test-kitchen'
 end