knife-chop 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Mzg4N2I5ZGIwZTdkMWQ1MzJkMjk1MmRlOWZjZWVlM2Y1OGJjMWMxNQ==
-  data.tar.gz: !binary |-
-    ZWE3NjU2NDg4NzYyNWNmZTdkZWUwN2FiZDNlYWI4MDc3NWE0MDA0Nw==
+SHA1:
+  metadata.gz: 1722a1f8ec18005aa407bdfa3ea83642e25d8e41
+  data.tar.gz: 4d25235cdec83d39ce4e629f2d31017d9017f1ed
 SHA512:
-  metadata.gz: !binary |-
-    NmQ4YTk4YmY1ZjhjZjk4MDcxNDk1N2M4YWFlYjg5ZWI4MWIzNDE2MzYwODYw
-    N2Y5NDhhOTIwN2RiNzhiOTJmZmNiN2FmYTYzOTI0NThjNTdkOGE2ZmUyMzky
-    NzQ3ZjZlNzg0NDlkZjU5MDNhZGMwZTM1NDY1OGE0NjgzZDNkYjY=
-  data.tar.gz: !binary |-
-    ZWIzZmZiYmI2MDRmZDllMjE0YmQyMzRlOGYzNmZjOGM1ZWZmOWYyYzhiNjYy
-    NWJmOTY2MzFjNjJmNWIxNWMyNTRiMDMzNjMwNjgwMGU4NTM3NTdkYjM3YzM3
-    Y2VmNGFiYWNiMGQ2ZmI4OGY4ZWQ5ZTMyNTI0YzUxN2M4NmEwYWU=
+  metadata.gz: 8f4dc19f63f4d545fd42aec481b81e291411bfb70a7e378e00aa7045eb8ccc5c332d42f7c20c9d62e80f0722cfca78540e7f28cc87d81c2e692ebda483b2072e
+  data.tar.gz: 3f58afbf1dbbc4e37fb671c48f53e4757128eae402fa0c942731d9aa99276933bf830beacb8b6e7eb7401fb7ef1352560e776a39f23157800612efd73d7def0d

data/Gemfile

@@ -22,4 +22,5 @@ group :development do
 #  gem "rcov", ">= 0"
   gem 'jeweler', '>= 2.0.1', '~> 2.0'
   gem "rspec", '~> 2.14', '>= 2.14.1'
+  gem 'rake'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    knife-chop (0.7.0)
+    knife-chop (0.7.1)
       awesome_print (~> 1.2, >= 1.2.0)
       chef (~> 11.12, >= 11.10.0)
       colorize (~> 0.7, >= 0.7.1)
@@ -45,7 +45,7 @@ GEM
       mixlib-log (~> 1.3)
       rack
     coderay (1.1.0)
-    colorize (0.7.2)
+    colorize (0.7.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
@@ -120,7 +120,7 @@ GEM
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     mixlib-shellout (1.4.0)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-scp (1.2.1)
@@ -154,7 +154,7 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rake (10.3.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
     rest-client (1.6.7)
@@ -210,6 +210,7 @@ DEPENDENCIES
   knife-ec2 (~> 0.6, >= 0.6.6)
   logging (~> 1.8, >= 1.8.2)
   mixlib-config (~> 2.1, >= 2.1.0)
+  rake
   rspec (~> 2.14, >= 2.14.1)
   safe_yaml
   unf (~> 0.1, >= 0.1.4)

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/knife-chop.iml

@@ -105,7 +105,7 @@
     <orderEntry type="library" scope="PROVIDED" name="chef (v11.12.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="chef-zero (v2.0.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="coderay (v1.1.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="colorize (v0.7.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="colorize (v0.7.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="descendants_tracker (v0.0.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="em-winrm (v0.5.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
@@ -121,7 +121,6 @@
     <orderEntry type="library" scope="PROVIDED" name="gssapi (v1.0.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="gyoku (v1.1.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="hashie (v2.1.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="highline (v1.6.21, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.3.4.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="httpi (v0.9.7, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="inifile (v2.0.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
@@ -141,20 +140,19 @@
     <orderEntry type="library" scope="PROVIDED" name="mixlib-config (v2.1.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mixlib-log (v1.6.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mixlib-shellout (v1.4.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multi_xml (v0.5.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.0.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="net-scp (v1.2.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="net-ssh (v2.9.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="net-ssh-gateway (v1.2.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="net-ssh-multi (v1.2.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.2.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="nori (v1.1.5, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="oauth2 (v0.9.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ohai (v7.0.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="pry (v0.9.12.6, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.3.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.3.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.1.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rest-client (v1.6.7, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec (v2.14.1, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
@@ -168,7 +166,6 @@
     <orderEntry type="library" scope="PROVIDED" name="systemu (v2.5.2, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.6, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="uuidtools (v2.1.4, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="wasabi (v1.0.0, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="winrm (v1.1.3, RVM: ruby-1.9.3-p545 [knife-chop]) [gem]" level="application" />

data/lib/chef/knife/chop_base.rb

@@ -658,16 +658,20 @@ class Chef
         raise ChopError.new "Oops! Where is the '#{chef}' directory? Also check cookbook path '#{@config[:cookbook_path]}'" unless File.directory?(chef)
         abs = File.realpath(File.expand_path("#{chef}/#{path}"))
         raise ChopError.new "Oops! Does 'chef/#{path}' directory exist?" unless File.directory?(abs)
-        Dir.glob("#{abs}/*").each{ |f|
-          match = File.basename(f).match(file_regex)
-          if match
-            name = match[1]
-            ext  = match[2]
-            set[ext] = {} unless set[ext]
-            @logger.trace "#{name} =~ #{regex}"
-            set[ext][name] = f if name.match(regex)
-          end
-        }
+        begin
+          Dir.glob("#{abs}/*").each{ |f|
+            match = File.basename(f).match(file_regex)
+            if match
+              name = match[1]
+              ext  = match[2]
+              set[ext] = {} unless set[ext]
+              @logger.trace "#{name} =~ #{regex}"
+              set[ext][name] = f if name.match(regex)
+            end
+          }
+        rescue RegexpError => e
+          raise ChopError.new "The regular expression attempting to match resources in '#{path}' is incorrect! #{e.message}"
+        end
         @logger.debug "getPathSet set=#{set.ai}"
         res = {}
         # Iterate extension sets in increasing precedence order ...

data/lib/chef/knife/chop_upload.rb

@@ -66,7 +66,6 @@ class Chef
           %(#{cmd} #{file})
         }
         cmd = callCmdProc(cmdp, rsrc,verb,xtra)
-        # RubyLocalVariableNamingConvention
         _getsubcmd = lambda{ ||
           argv = "#{rsrc} #{verb}".split(%r(\s+))
           klass= Chef::Knife.subcommand_class_from(argv)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Christo De Lange
@@ -14,180 +14,180 @@ dependencies:
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.10.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.10.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.12'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: knife-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.6
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.6
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 description: Knife plugin to assist with the upload and sync of Chef server assets
@@ -265,12 +265,12 @@ require_paths:
 - lib
 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: []