between_meals 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5952ca7e5fa6d2486432f7a3c6680e01829056e0
+  data.tar.gz: e1a35decf62bb0cc2fbb7bda9e449754184f50cd
+SHA512:
+  metadata.gz: 5b179124ee7a2330a15e52c87784ad975f1110954cfefc61ad351dc125b57740604eb8197b2ec3320ee3c237ff1ae6bb79471b678a03fd5e4693837289ffaca3
+  data.tar.gz: fa1efa5aaa80231f1b9b2dab50427e608ea3a4bd6e1c910d36ab61ffa33928076b2f841e5aa1d8a4a93e00aaa19b8bd4a0545dccb0db4e1d0648090bc93e0b15

data/lib/between_meals/changes/cookbook.rb

@@ -38,7 +38,8 @@ module BetweenMeals
           info("Cookbook is #{m[1]}")
           return {
             :cookbook_dir => dir,
-            :name => m[1] }
+            :name => m[1],
+          }
         end
         nil
       end
@@ -47,7 +48,7 @@ module BetweenMeals
         @files = files
         @name = self.class.explode_path(
           files.sample[:path],
-          cookbook_dirs
+          cookbook_dirs,
         )[:name]
         # if metadata.rb is being deleted
         #   cookbook is marked for deletion

data/lib/between_meals/changes/role.rb

@@ -20,7 +20,7 @@ module BetweenMeals
     # Changeset aware role
     class Role < Change
       def self.name_from_path(path, role_dir)
-        re = %r{^#{role_dir}/(.+)\.rb}
+        re = %r{^#{role_dir}/(.+)\.(?:rb|json)}
         debug("[role] Matching #{path} against #{re}")
         m = path.match(re)
         if m

data/lib/between_meals/changeset.rb

@@ -27,7 +27,7 @@ module BetweenMeals
   # Basically, you always want to use BetweenMeals::Changes through this
   # helper class.
   class Changeset
-    class ReferenceError < Exception
+    class ReferenceError < RuntimeError
     end
 
     def initialize(logger, repo, start_ref, end_ref, locations)

data/lib/between_meals/cmd.rb

@@ -34,7 +34,7 @@ module BetweenMeals
       @logger.info("Running \"#{cmd}\"")
       c = Mixlib::ShellOut.new(
         cmd,
-        :cwd => cwd
+        :cwd => cwd,
       )
       c.run_command
       c.error!

data/lib/between_meals/knife.rb

@@ -42,6 +42,7 @@ module BetweenMeals
       @pem = opts[:pem] ||
              "#{@home}/.chef/#{@user}-taste-tester.pem"
       @role_dir = opts[:role_dir]
+      @role_type = opts[:role_type] || 'rb'
       @cookbook_dirs = opts[:cookbook_dirs]
       @databag_dir = opts[:databag_dir]
       @checksum_dir = opts[:checksum_dir]
@@ -51,14 +52,16 @@ module BetweenMeals
 
     def role_upload_all
       if File.exists?(@role_dir)
-        roles = File.join(@role_dir, '*.rb')
+        roles = File.join(@role_dir, "*.#{@role_type}")
         exec!("#{@knife} role from file #{roles} -c #{@config}", @logger)
       end
     end
 
     def role_upload(roles)
       if roles.any?
-        roles = roles.map { |x| File.join(@role_dir, "#{x.name}.rb") }.join(' ')
+        roles = roles.map do |x|
+          File.join(@role_dir, "#{x.name}.#{@role_type}")
+        end.join(' ')
         exec!("#{@knife} role from file #{roles} -c #{@config}", @logger)
       end
     end
@@ -144,7 +147,7 @@ module BetweenMeals
           end.join(' ')
           exec!(
             "#{@knife} data bag from file #{dbname} #{dbitems} -c #{@config}",
-            @logger
+            @logger,
           )
         end
       end
@@ -181,7 +184,7 @@ BLOCK
       end
       cfg << "]\n"
       unless File.directory?(File.dirname(@config))
-        Dir.mkdir(File.dirname(@config), 0755)
+        Dir.mkdir(File.dirname(@config), 0o755)
       end
       if !File.exists?(@config) ||
          ::Digest::MD5.hexdigest(cfg) !=
@@ -234,7 +237,7 @@ IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
       s = Mixlib::ShellOut.new("#{@knife} data bag list" +
                                " --format json -c #{@config}").run_command
       s.error!
-      db = JSON.load(s.stdout)
+      db = JSON.parse(s.stdout)
       unless db.include?(databag)
         exec!("#{@knife} data bag create #{databag} -c #{@config}", @logger)
       end
@@ -244,7 +247,7 @@ IAMAEpsWX2s2A6phgMCx7kH6wMmoZn3hb7Thh9+PfR8Jtp2/7k+ibCeF4gEWUCs5
       s = Mixlib::ShellOut.new("#{@knife} data bag show #{databag}" +
                                " --format json -c #{@config}").run_command
       s.error!
-      db = JSON.load(s.stdout)
+      db = JSON.parse(s.stdout)
       if db.empty?
         exec!("#{@knife} data bag delete #{databag} --yes -c #{@config}",
               @logger)

data/lib/between_meals/repo/git.rb

@@ -60,7 +60,7 @@ module BetweenMeals
           {
             :message => msg,
             :update_ref => 'HEAD',
-          }
+          },
         )
       end
 
@@ -89,7 +89,7 @@ module BetweenMeals
         rescue => e
           # We've seen some weird non-reproducible failures here
           @logger.error(
-            'Something went wrong. Please please report this output.'
+            'Something went wrong. Please report this output.',
           )
           @logger.error(e)
           stdout.lines.each do |line|
@@ -158,57 +158,57 @@ module BetweenMeals
             # A path
             {
               :status => :modified,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^C(?:\d*)\s+(\S+)\s+(\S+)/
             # C<numbers> path1 path2
             {
               :status => :modified,
-              :path => Regexp.last_match(2)
+              :path => Regexp.last_match(2),
             }
           when /^D\s+(\S+)$/
             # D path
             {
               :status => :deleted,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^M(?:\d*)\s+(\S+)$/
             # M<numbers> path
             {
               :status => :modified,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^R(?:\d*)\s+(\S+)\s+(\S+)/
             # R<numbers> path1 path2
             [
               {
                 :status => :deleted,
-                :path => Regexp.last_match(1)
+                :path => Regexp.last_match(1),
               },
               {
                 :status => :modified,
-                :path => Regexp.last_match(2)
-              }
+                :path => Regexp.last_match(2),
+              },
             ]
           when /^T\s+(\S+)$/
             # T path
             [
               {
                 :status => :deleted,
-                :path => Regexp.last_match(1)
+                :path => Regexp.last_match(1),
               },
               {
                 :status => :modified,
-                :path => Regexp.last_match(1)
-              }
+                :path => Regexp.last_match(1),
+              },
             ]
           else
-            fail 'No match'
+            fail 'Failed to parse repo diff line.'
           end
         end.flatten.map do |x|
           {
             :status => x[:status],
-            :path => x[:path].sub("#{@repo_path}/", '')
+            :path => x[:path].sub("#{@repo_path}/", ''),
           }
         end
         # rubocop:enable MultilineBlockChain

data/lib/between_meals/repo/hg.rb

@@ -53,7 +53,7 @@ module BetweenMeals
         rescue => e
           # We've seen some weird non-reproducible failures here
           @logger.error(
-            'Something went wrong. Please please report this output.'
+            'Something went wrong. Please report this output.',
           )
           @logger.error(e)
           stdout.lines.each do |line|
@@ -171,40 +171,40 @@ module BetweenMeals
           when /^A (\S+)$/
             {
               :status => :added,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^C (\S+)$/
             {
               :status => :clean,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^R (\S+)$/
             {
               :status => :deleted,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^M (\S+)$/
             {
               :status => :modified,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^! (\S+)$/
             {
               :status => :missing,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^\? (\S+)$/
             {
               :status => :untracked,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           when /^I (\S+)$/
             {
               :status => :ignored,
-              :path => Regexp.last_match(1)
+              :path => Regexp.last_match(1),
             }
           else
-            fail 'No match'
+            fail 'Failed to parse repo diff line.'
           end
         end
         # rubocop:enable MultilineBlockChain

data/lib/between_meals/repo/svn.rb

@@ -66,7 +66,7 @@ module BetweenMeals
           parse_status(changes).compact
         rescue => e
           @logger.error(
-            'Something went wrong. Please please report this output.'
+            'Something went wrong. Please report this output.',
           )
           @logger.error(e)
           stdout.lines.each do |line|
@@ -103,13 +103,13 @@ module BetweenMeals
         # http://svnbook.red-bean.com/en/1.0/re26.html
         changes.lines.map do |line|
           case line
-          when (/^([\w ])\w?\s+(\S+)$/)
+          when /^([\w ])\w?\s+(\S+)$/
             {
               :status => Regexp.last_match(1) == 'D' ? :deleted : :modified,
               :path => Regexp.last_match(2).sub("#{@repo_path}/", ''),
             }
           else
-            fail 'No match'
+            fail 'Failed to parse repo diff line.'
           end
         end
       end

metadata

@@ -1,208 +1,189 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: between_meals
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - Phil Dibowitz
 - Marcin Sawicki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-11-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-09-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: colorize
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mixlib-shellout
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rugged
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec-mocks
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rubocop
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library for calculation Chef differences between revisions
 email: 
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - README.md
 - LICENSE
-- lib/between_meals/knife.rb
-- lib/between_meals/cmd.rb
 - lib/between_meals/util.rb
-- lib/between_meals/repo.rb
 - lib/between_meals/changeset.rb
+- lib/between_meals/knife.rb
+- lib/between_meals/repo.rb
+- lib/between_meals/cmd.rb
+- lib/between_meals/changes/databag.rb
+- lib/between_meals/changes/cookbook.rb
 - lib/between_meals/changes/change.rb
 - lib/between_meals/changes/role.rb
-- lib/between_meals/changes/cookbook.rb
-- lib/between_meals/changes/databag.rb
+- lib/between_meals/repo/git.rb
+- lib/between_meals/repo/svn.rb
+- lib/between_meals/repo/git/cmd.rb
 - lib/between_meals/repo/svn/cmd.rb
 - lib/between_meals/repo/hg/cmd.rb
-- lib/between_meals/repo/git/cmd.rb
-- lib/between_meals/repo/svn.rb
-- lib/between_meals/repo/git.rb
 - lib/between_meals/repo/hg.rb
 homepage: https://github.com/facebook/between-meals
-licenses: 
+licenses:
 - Apache
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Between Meals
 test_files: []
-