knife-chop 0.7.8 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWI4ZDdlYTdjYWRmZjBmOWU1NGQ5NTVkYjEyZmY3M2IxYjc0NGE0MQ==
+    YjFlM2VlMTY3MDAzYTM0MzdkZjEyNzMyYTY0YzZkNzJmZTQ4OWZjMw==
   data.tar.gz: !binary |-
-    N2ZjZTI1MmIwNjQ1OTk4M2EwNzAxZmVjM2FiM2YzNjdmZjU2MTYzOQ==
+    NzJiNmJlYTY1OTA4ZGFjNTViYmExNTA3M2ZjNzJiNjQ3YTRlMDRjNw==
 SHA512:
   metadata.gz: !binary |-
-    M2ViMTBkZjgwYTI0ZTBmNjI4Y2I4ZWQ0MDgzNjFmNDAwNjZkZmUxNmIzNjFi
-    YWZhMDY1MTg4Mjk4MDhkN2JjOGFlZWE1ZjA2MjBiMzIwYzg5OTA0ODM0Zjc0
-    ZWY0OThhNWUwNTUzZjhjY2MyNDQ2NjJlYWFlZmQ3NTdhMTQxNGU=
+    NDZjNWI1NmIyZTU3NGI4M2YwYmEzYjMzM2QwMjU1ZWE2Nzg5YjUzNGVmNDIw
+    Y2Y4NTI0MjMyZDEzY2FiMWEyZmQ1MWJiNmFhYzRhYmQ0NDkwNzJkZmEzYWY3
+    NmY5OTRjNmNjMTFlOWViNDE5OTRhZjIzMWIzNWVmZGFkYmVkMzU=
   data.tar.gz: !binary |-
-    MWNlZTMxM2Y2YjhlZDEwZjE1YjE5MGZkNWY2YWNhMWQ3YjlkYmUwN2ZmMjFh
-    MDc2YWZiM2E4OTc4ZjFiMjk3N2NkYjY3YTQ1MzdhYzJhNmEyZmI1MWYyODBi
-    ZGM2OGU2MzZkMWM0NTkyYjJiYzcwOTY3MDdiYmVlNjZjOWM2NWE=
+    OGNiNDViZjA1N2Q2MGUzNTI1MmQwZmY1MWUzZDM4ZWU3MmI4Yjg3OGE5YjM0
+    NzBhOTZmZGFkN2I5NThjYTgyNTNmODIyNzM1ZDdhZjU5YjBhYjliZmI2NTAz
+    ZTc2ZGNiM2YwYzAwMTMxNGFlYWFhYzNiNWZhNzY5NmRkYWRhMGE=

data/Rakefile

@@ -40,6 +40,11 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+require 'rake'
+
+require 'rubygems/tasks'
+Gem::Tasks.new
+
 require File.dirname(__FILE__) + '/lib/chef/knife/chop/version'
 desc "Commit it, push it, build it, tag it and ship it"
 task :ship => [:clobber_package,:clobber_rdoc,:gem] do

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.8.0

data/knife-chop.gemspec

@@ -5,7 +5,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Christo De Lange"]
-  s.date = "2014-07-01"
   s.description = "Knife plugin to assist with the upload and sync of Chef server assets like roles, environments and cookbooks allowing for multiple parts to be uploaded at once to multiple environments. Resources can be matched with regular expressions."
   s.email = "rubygems@dldinternet.com"
   s.executables = ["chop"]
@@ -20,7 +19,6 @@ Gem::Specification.new do |s|
 
   s.homepage = "http://github.com/dldinternet/knife-chop"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
   s.summary = "Knife plugin to ease the upload and sync of Chef server assets"
 
   s.add_dependency %q<awesome_print>, [">= 1.2.0", "~> 1.2"]
@@ -32,5 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency %q<chef>, [">= 11.12.0", "~> 11.12"]
   s.add_dependency %q<safe_yaml>, [">= 0"]
 
+  s.add_development_dependency 'rubygems-tasks', '~> 0.2'
+
 end
 

data/lib/chef/knife/chop/ui.rb

@@ -64,10 +64,6 @@ class Chef
         error(message)
       end
 
-      def error(message)
-        msg(message)
-      end
-
       # Print a warning message
       def warn(message)
         msg(message)
@@ -90,6 +86,7 @@ class Chef
       end
 
       def shifted(name)
+        name = 'info' unless ::Logging::LEVELS.has_key?(name)
         num = ::Logging::LEVELS[name]+1
         case name
         when 'todo'

data/lib/chef/knife/chop_base.rb

@@ -280,14 +280,14 @@ class Chef
                   :short        => "-P",
                   :long         => "--cookbook-path PATH",
                   :description  => "Cookbook search path, Default chef/cookbooks/:chef/vendor-cookbooks",
-                  :default      => ["cookbooks/","vendor-cookbooks"],
+                  :default      => ["cookbooks","vendor-cookbooks"],
                   :proc         => lambda{|v|
                     $CHOP.parseOptionString(v,'[:,]','parsePath')
                   }
           option  :repo_path,
                   :long         => "--repo-path PATH",
                   :description  => "Chef repo path, Default ./chef",
-                  :default      => "./chef",
+                  :default      => ".",
                   #:required     => true,
                   :proc         => lambda{|v|
                     File.expand_path(v)
@@ -307,12 +307,12 @@ class Chef
                   :proc         => lambda{|v|
                     $CHOP.parseOptionString(v)
                   },
-                  :default      => ['web.*']
+                  :default      => ['.*']
           option  :databags,
                   :short        => "-b",
                   :long         => "--databags BAGS",
                   :description  => "Data bags to upload",
-                  :default      => ['aws:s3_.*_dev;s3_ro_.*','users:web.*;christo.*;tmiller.*'],
+                  :default      => ['.*:.*'],
                   :proc         => lambda{|v|
                     $CHOP.parseOptionString(v)
                   }
@@ -320,7 +320,7 @@ class Chef
                   :short        => "-r",
                   :long         => "--roles ROLES",
                   :description  => "Roles to upload",
-                  :default      => ["web.*"],
+                  :default      => [".*"],
                   :proc         => lambda{|v|
                     $CHOP.parseOptionString(v)
                   }
@@ -750,6 +750,18 @@ class Chef
         end
       end
 
+      # --------------------------------------------------------------------------------
+      def getKnifeSubCommand(rsrc, verb)
+        # WARNING: Don't be clever ... rsrc and verb can each have one or more spaces ... argv = [rsrc, verb]
+        argv = "#{rsrc} #{verb}".split(%r(\s+))
+        klass= ::Chef::Knife.subcommand_class_from(argv)
+        subc = klass.new
+        subc.config = @config.dup
+        subc.config[:cookbook_path] = @config[:cookbook_path].map { |p| p.match(%r(^/)) ? p : "#{@config[:repo_path]}/#{p}" } #.join(::File::PATH_SEPARATOR)
+        subc.ui = ::Chef::Knife::ChopUI.new(@logger, @config)
+        subc
+      end
+
       # --------------------------------------------------------------------------------
       def callCmdProc(cmdp, a, b, c)
         ret = nil

data/lib/chef/knife/chop_upload.rb

@@ -47,6 +47,38 @@ class Chef
       private
       # --------------------------------------------------------------------------------
 
+      # --------------------------------------------------------------------------------
+      def maybeCreateDataBag(bag)
+        subc = getKnifeSubCommand('data bag','show')
+        subc.name_args << bag
+        subc.name_args.flatten!
+        create = false
+        unless @config[:dry_run]
+          begin
+            subc.run
+          rescue => e
+            @logger.info "Searching for data bag yields: #{e.response.body if e.respond_to?('response')}"
+            @logger.warn "Create data bag #{bag}"
+            create = true
+          end
+        end
+        if create
+
+          subc = getKnifeSubCommand('data bag','create')
+          subc.name_args << bag
+          subc.name_args.flatten!
+
+          unless @config[:dry_run]
+            begin
+              subc.run
+            rescue => e
+              @logger.error "#{e.class.name} #{e.message} #{e.response.body if e.respond_to?('response')}"
+              raise e
+            end
+          end
+        end
+      end
+
       # --------------------------------------------------------------------------------
       def uploadSet(set,args={})
         raise ChopInternalError.new "Incorrect use of uploadSet method from #{Kernel.caller[0].ai}" unless args.is_a?(Hash)
@@ -66,18 +98,20 @@ class Chef
           %(#{cmd} #{file})
         }
         cmd = callCmdProc(cmdp, rsrc,verb,xtra)
-        _getsubcmd = lambda{ ||
-          argv = "#{rsrc} #{verb}".split(%r(\s+))
-          klass= Chef::Knife.subcommand_class_from(argv)
-          subc = klass.new
-          subc.config = @config.dup
-          subc.config[:cookbook_path] = @config[:cookbook_path].map{|p| p.match(%r(^/)) ? p : "#{@config[:repo_path]}/#{p}" } #.join(::File::PATH_SEPARATOR)
-          subc.ui = ::Chef::Knife::ChopUI.new(@logger,@config)
-          subc
-        }
+        # [2014-07-28 Christo] Distilled out a reusable method called getKnifeSubCommand
+        # _getsubcmd = lambda do |r,v|
+        #   argv = "#{r} #{v}".split(%r(\s+))
+        #   klass= Chef::Knife.subcommand_class_from(argv)
+        #   subc = klass.new
+        #   subc.config = @config.dup
+        #   subc.config[:cookbook_path] = @config[:cookbook_path].map { |p| p.match(%r(^/)) ? p : "#{@config[:repo_path]}/#{p}" } #.join(::File::PATH_SEPARATOR)
+        #   subc.ui = ::Chef::Knife::ChopUI.new(@logger, @config)
+        #   subc
+        # end
 
         if args[:aggregate] and @use_knife_api
-          subc = _getsubcmd.call
+          # subc = _getsubcmd.call(rsrc,verb)
+          subc = getKnifeSubCommand(rsrc,verb)
           subc.name_args << xtra if xtra != ''
           subc.name_args << set.map{ |name,file|
             extname  = File.extname(file)
@@ -105,7 +139,6 @@ class Chef
             end
           }
           subc.name_args.flatten!
-          #cmd = callCmdProc(filp, cmd, set.map{|name,file| name}.to_s, set.map{|name,file| file}.join(' '))
           @logger.info "#{cmd} #{set.map{|name,file| file}.ai} ... "
           @logger.info "#{cmd} #{subc.name_args.ai} ... "
           unless @config[:dry_run]
@@ -158,7 +191,7 @@ class Chef
         logStep "Upload data bags"
         want = Hash.new
         @config[:databags].each{ |b|
-          match = b.match(%r/^(.*):(.*)$/)
+          match = b.match(%r/^(.*?):(.*)$/)
           if match
             want[match[1]] = parseOptionString(match[2],'[:;]')
           end
@@ -170,14 +203,23 @@ class Chef
             name  = File.basename(d)
             regex = "^(#{want.keys.join('|')})"
             match = matches(name,regex)
-            if match and want.has_key?(name)
-              databags[name] = getPathSet(want[name], "data_bags/#{name}")
+            if match
+              if want.has_key?(name)
+                keys = [ name ]
+              else
+                keys = want.keys.select{|k| name.match(/^#{k}/) }
+              end
+              databags[name] = {}
+              keys.each do |key|
+                databags[name].merge! getPathSet(want[key], "data_bags/#{name}")
+              end
               @logger.debug "Data bags: (#{name}) #{databags[name].ai}"
             end
           end
         }
         @logger.info "Data bag list: (#{@config[:databags]}) #{databags.ai}"
         databags.each{ |bag,files|
+          maybeCreateDataBag(bag)
           uploadSet(files, :resource => 'data bag', :extra => bag, :aggregate => true)
         }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-chop
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -164,6 +164,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Knife plugin to assist with the upload and sync of Chef server assets
   like roles, environments and cookbooks allowing for multiple parts to be uploaded
   at once to multiple environments. Resources can be matched with regular expressions.