builderator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1165e5306fde1228d9bca1afa98531042ef08d29
-  data.tar.gz: b31a626d1c14bbc717022174b1cfa802c4caa222
+  metadata.gz: c50ce622dec2d73dd13406c3b941149298d271cf
+  data.tar.gz: 6d021cc692497f5572185ca42852cb7f6afe8fee
 SHA512:
-  metadata.gz: bdd44c1a386da6ae63c130828443c7140a56b404eaa10e034267e9ae43eac8d7b9e88a8802aa7655698333b8c38b5c3eb8c902518afabfb3a3c50909729f3948
-  data.tar.gz: a5fa532a17692961048d13695465e4ffa09e5214fbdce58014ed678fc10785202ab4aef90095168a09e69959e23f9328fcbb030ce7b3ebdd37c2a6c02c9c25c8
+  metadata.gz: 7989a99fdf08aaf981be134f963ab43884dec0864e95f8a5c0016b644211bbbf112561281ddc26ca88a57d7a081b7c8e0fc71f0c9dca6239ff0d610901c4fdce
+  data.tar.gz: a3c5d7ac1514f5af7d6d84d5b37f4a3a2e464b75b04281a2000794b7222bd952282f9d69810ab63ec671e73db6250be49964b0d08621aaefb3bac750c4dfd11c

data/Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     builderator (0.0.1)
       aws-sdk (~> 2.0)
       berkshelf (~> 4.3)
+      chef (~> 12.5)
       dep_selector (~> 1.0)
       faraday_middleware (~> 0.10.0)
       ignorefile
@@ -49,15 +50,45 @@ GEM
     buff-ruby_engine (0.1.0)
     buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
+    builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.9.38)
-      fuzzyurl (~> 0.8.0)
+    chef (12.7.2)
+      chef-config (= 12.7.2)
+      chef-zero (~> 4.5)
+      diff-lcs (~> 1.2, >= 1.2.4)
+      erubis (~> 2.7)
+      ffi-yajl (~> 2.2)
+      highline (~> 1.6, >= 1.6.9)
+      mixlib-authentication (~> 1.4)
+      mixlib-cli (~> 1.4)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 2.0)
+      net-ssh (>= 2.9, < 4.0)
+      net-ssh-multi (~> 1.1)
+      ohai (>= 8.6.0.alpha.1, < 9)
+      plist (~> 3.1.0)
+      proxifier (~> 1.0)
+      rspec-core (~> 3.4)
+      rspec-expectations (~> 3.4)
+      rspec-mocks (~> 3.4)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+      uuidtools (~> 2.1.5)
+    chef-config (12.7.2)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
+    chef-zero (4.6.1)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 4.0)
+      mixlib-log (~> 1.3)
+      rack
+      uuidtools (~> 2.1)
     cleanroom (1.0.0)
     dep-selector-libgecode (1.2.0)
     dep_selector (1.0.3)
@@ -70,32 +101,62 @@ GEM
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
     ffi (1.9.10)
-    fuzzyurl (0.8.0)
+    ffi-yajl (2.2.3)
+      libyajl2 (~> 1.2)
     hashie (3.4.3)
+    highline (1.7.8)
     hitimes (1.2.3)
     httpclient (2.7.1)
     ignorefile (1.1.0)
+    ipaddress (0.8.3)
     jmespath (1.2.4)
       json_pure (>= 1.8.1)
     json (1.8.3)
     json_pure (1.8.3)
+    libyajl2 (1.2.0)
     minitar (0.5.4)
     mixlib-authentication (1.4.0)
       mixlib-log
       rspec-core (~> 3.2)
       rspec-expectations (~> 3.2)
       rspec-mocks (~> 3.2)
+    mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
     mixlib-shellout (2.2.6)
     molinillo (0.4.4)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.1.1)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    net-telnet (0.1.1)
     nio4r (1.2.1)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    ohai (8.15.1)
+      chef-config (>= 12.5.0.alpha.1, < 13)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      ipaddress
+      mixlib-cli
+      mixlib-config (~> 2.0)
+      mixlib-log
+      mixlib-shellout (~> 2.0)
+      plist (~> 3.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
     parser (2.3.0.7)
       ast (~> 2.2)
+    plist (3.1.0)
     powerpack (0.1.1)
+    proxifier (1.0.3)
+    rack (1.6.4)
     rainbow (2.1.0)
     rake (10.5.0)
     retryable (2.0.3)
@@ -126,10 +187,16 @@ GEM
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.39.0)
       parser (>= 2.3.0.7, < 3.0)
       powerpack (~> 0.1)
@@ -141,9 +208,22 @@ GEM
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.2.1)
+    serverspec (2.31.1)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.53)
+    sfl (2.2)
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
+    specinfra (2.56.1)
+      net-scp
+      net-ssh (>= 2.7, < 4.0)
+      net-telnet
+      sfl
+    syslog-logger (1.6.8)
+    systemu (2.6.5)
     thor (0.19.1)
     thor-scmversion (1.7.0)
       mixlib-shellout
@@ -151,9 +231,11 @@ GEM
     timers (4.0.4)
       hitimes
     unicode-display_width (1.0.3)
+    uuidtools (2.1.5)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)
+    wmi-lite (1.0.0)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/builderator.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk', '~> 2.0'
   spec.add_dependency 'berkshelf', '~> 4.3'
   spec.add_dependency 'dep_selector', '~> 1.0'
-  # spec.add_dependency 'chef', '~> 12.5'
+  spec.add_dependency 'chef', '~> 12.5'
   spec.add_dependency 'faraday_middleware', '~> 0.10.0'
   spec.add_dependency 'ignorefile'
   spec.add_dependency 'thor', '~> 0.19.0'

data/docs/configuration/cookbook.md

@@ -17,3 +17,11 @@ Collection of declared cookbook dependencies. Options are passed to [Berkshelf](
 * `ref` A comittish reference from which to fetch the cookbook
 * `rel` The sub-directory of a git repository to check out as a cookbook
 * `path` The path to a local cookbook, relative to the build workspace.
+
+## Tasks
+
+* `berks metadata COOKBOOK` Generates a `metadata.json` file from a local cookbook's `metadata.rb` file. The specified `COOKBOOK` must be in the `cookbook.depends` collection with a valid `path` attribute.
+* `berks vendor` Resolve and fetch cookbooks for the `cookbook.depends` collection and store in `$VENDOR_PATH/cookbooks`
+* `berks upload` Upload the resolved dependency set for `cookbook.depends` to the Chef Server configured in Berkshelf's configuration (default `$HOME/.berkshelf/config.json`)
+* `berks clean` Removes the project's cookbook vendor cache.
+* `berks uncache` is a helper to clear Berkshelf's host-cache, in `$HOME/.berkshelf/cookbooks` by default.

data/lib/builderator/tasks/berkshelf.rb

@@ -1,3 +1,4 @@
+require 'chef/cookbook/metadata'
 require 'thor'
 
 require_relative '../interface/berkshelf'
@@ -20,6 +21,20 @@ module Builderator
         Interface.berkshelf.write
       end
 
+      desc 'metadata COOKBOOK', 'Generate metadata.json from metadata.rb for a COOKBOOK that has a path'
+      def metadata(cookbook)
+        fail "Cookbook #{ cookbook } does not have a path!" unless Config.cookbook.depends.has?(cookbook) &&
+                                                                   !Config.cookbook.depends[cookbook].path.nil?
+
+        cookbook_path = Config.cookbook.depends[cookbook].path
+        metadata_rb = Chef::Cookbook::Metadata.new
+
+        metadata_rb.from_file(::File.join(cookbook_path, 'metadata.rb'))
+
+        say_status :metadata, "for cookbook #{ metadata_rb.name }@#{ metadata_rb.version }"
+        create_file ::File.join(cookbook_path, 'metadata.json'), metadata_rb.to_json, :force => true
+      end
+
       desc 'vendor', 'Vendor a cookbook release and its dependencies'
       def vendor
         invoke :configure, [], options

data/lib/builderator/tasks/cookbook.rb

@@ -1,109 +1,109 @@
-require 'chef'
-require 'chef/cookbook_site_streaming_uploader'
-require 'rubygems/package'
-require 'thor'
-require 'thor/actions'
-require 'thor-scmversion'
-require 'zlib'
-
-require_relative '../util'
-require_relative '../util/cookbook'
-
-module Builderator
-  module Tasks
-    class Cookbook < Thor
-      include Thor::Actions
-      class_option :version, :type => :boolean,
-                             :default => true,
-                             :desc => 'Write current verison to file'
-
-      desc 'metadata [PATH]', 'Use cookbook matadata file at PATH/metadata.rb to generate PATH/matadata.json'
-      def metadata(cookbook = nil)
-        Util::Cookbook.path(cookbook) unless cookbook.nil?
-        metadata = Util::Cookbook.metadata
-
-        invoke 'version:current', [], options if options['version']
-        say_status :metadata, "for cookbook #{ metadata.name }@#{ metadata.version }"
-        create_file Util::Cookbook.path.join('metadata.json').to_s, metadata.to_json, :force => true
-
-        metadata
-      end
-
-      desc 'build PATH', 'Package cookbook at PATH into a tarball'
-      def build(cookbook = nil)
-        Util::Cookbook.path(cookbook) unless cookbook.nil?
-
-        ## Generate metadata.json
-        metadata = invoke(Tasks::Cookbook, :metadata, [], options)
-
-        ## Create a gzipped tarball and add cookbook files to it. We avoid
-        ##   buffering this in memory (e.g. using StringIO) at all cost
-        ##   to keep large files from gumming things up.
-        say_status :package, "cookbook into #{ metadata.archive }"
-        metadata.archive.open('wb') do |package|
-          Zlib::GzipWriter.wrap(package) do |gz|
-            Gem::Package::TarWriter.new(gz) do |tar|
-              metadata.files.each do |f|
-                f_stat = File.stat(f)
-
-                ## Add directories
-                next tar.mkdir(Util::Cookbook.archive_path(metadata, f).to_s, f_stat.mode) if File.directory?(f)
-
-                ## Add files
-                tar.add_file_simple(Util::Cookbook.archive_path(metadata, f).to_s, f_stat.mode, f_stat.size) do |entry|
-                  f.open('rb') { |h| entry.write(h.read) }
-                end
-              end
-            end
-          end
-        end
-
-        metadata
-      end
-
-      desc 'push PATH', 'Publish cookbook at PATH to supermarket.chef.io'
-      option 'chef-config', :type => :string,
-                            :aliases => :c,
-                            :default => File.join(ENV['HOME'], '.chef/knife.rb')
-      option :site, :type => :string, :aliases => :s
-      option :user, :type => :string, :aliases => :u
-      option :key, :type => :string, :aliases => :k
-      def push(cookbook = nil)
-        Chef::Config.from_file(options['chef-config'])
-        Util::Cookbook.path(cookbook) unless cookbook.nil?
-
-        ## Set defaults after Chef::Config is loaded
-        options['site'] ||= Chef::Config.knife['supermarket_site'] || 'https://supermarket.chef.io/'
-        options['user'] ||= Chef::Config.knife['supermarket_user'] || Chef::Config.node_name
-        options['key'] ||= Chef::Config.knife['supermarket_key'] || Chef::Config.client_key
-
-        ## Build the cookbook taball
-        metadata = invoke(Tasks::Cookbook, :build, [cookbook], options)
-        say_status :upload, "cookbook #{ metadata.name }@#{ metadata.version } to #{ options['site'] }"
-
-        metadata.archive.open('rb') do |c|
-          http_resp = Chef::CookbookSiteStreamingUploader.post(
-            File.join(options['site'], '/api/v1/cookbooks'),
-            options['user'],
-            options['key'],
-            :tarball => c,
-            :cookbook => { :category => '' }.to_json
-          )
-
-          if http_resp.code.to_i != 201
-            say_status :error, "Error uploading cookbook: #{ http_resp.code } #{ http_resp.message }", :red
-            say http_resp.body
-            exit(1)
-          end
-        end
-      end
-
-      desc 'version COOKBOOK', 'Print the current version of a vendored cookbook'
-      option :path, :default => Util::Cookbook::DEFAULT_VENDOR, :desc => 'Path to vendored cookbooks'
-      def version(cookbook)
-        Util::Cookbook.path(File.join(options['path'], cookbook))
-        puts Util::Cookbook.metadata.version
-      end
-    end
-  end
-end
+# require 'chef'
+# require 'chef/cookbook_site_streaming_uploader'
+# require 'rubygems/package'
+# require 'thor'
+# require 'thor/actions'
+# require 'thor-scmversion'
+# require 'zlib'
+#
+# require_relative '../util'
+# require_relative '../util/cookbook'
+#
+# module Builderator
+#   module Tasks
+#     class Cookbook < Thor
+#       include Thor::Actions
+#       class_option :version, :type => :boolean,
+#                              :default => true,
+#                              :desc => 'Write current verison to file'
+#
+#       desc 'metadata [PATH]', 'Use cookbook matadata file at PATH/metadata.rb to generate PATH/matadata.json'
+#       def metadata(cookbook = nil)
+#         Util::Cookbook.path(cookbook) unless cookbook.nil?
+#         metadata = Util::Cookbook.metadata
+#
+#         invoke 'version:current', [], options if options['version']
+#         say_status :metadata, "for cookbook #{ metadata.name }@#{ metadata.version }"
+#         create_file Util::Cookbook.path.join('metadata.json').to_s, metadata.to_json, :force => true
+#
+#         metadata
+#       end
+#
+#       desc 'build PATH', 'Package cookbook at PATH into a tarball'
+#       def build(cookbook = nil)
+#         Util::Cookbook.path(cookbook) unless cookbook.nil?
+#
+#         ## Generate metadata.json
+#         metadata = invoke(Tasks::Cookbook, :metadata, [], options)
+#
+#         ## Create a gzipped tarball and add cookbook files to it. We avoid
+#         ##   buffering this in memory (e.g. using StringIO) at all cost
+#         ##   to keep large files from gumming things up.
+#         say_status :package, "cookbook into #{ metadata.archive }"
+#         metadata.archive.open('wb') do |package|
+#           Zlib::GzipWriter.wrap(package) do |gz|
+#             Gem::Package::TarWriter.new(gz) do |tar|
+#               metadata.files.each do |f|
+#                 f_stat = File.stat(f)
+#
+#                 ## Add directories
+#                 next tar.mkdir(Util::Cookbook.archive_path(metadata, f).to_s, f_stat.mode) if File.directory?(f)
+#
+#                 ## Add files
+#                 tar.add_file_simple(Util::Cookbook.archive_path(metadata, f).to_s, f_stat.mode, f_stat.size) do |entry|
+#                   f.open('rb') { |h| entry.write(h.read) }
+#                 end
+#               end
+#             end
+#           end
+#         end
+#
+#         metadata
+#       end
+#
+#       desc 'push PATH', 'Publish cookbook at PATH to supermarket.chef.io'
+#       option 'chef-config', :type => :string,
+#                             :aliases => :c,
+#                             :default => File.join(ENV['HOME'], '.chef/knife.rb')
+#       option :site, :type => :string, :aliases => :s
+#       option :user, :type => :string, :aliases => :u
+#       option :key, :type => :string, :aliases => :k
+#       def push(cookbook = nil)
+#         Chef::Config.from_file(options['chef-config'])
+#         Util::Cookbook.path(cookbook) unless cookbook.nil?
+#
+#         ## Set defaults after Chef::Config is loaded
+#         options['site'] ||= Chef::Config.knife['supermarket_site'] || 'https://supermarket.chef.io/'
+#         options['user'] ||= Chef::Config.knife['supermarket_user'] || Chef::Config.node_name
+#         options['key'] ||= Chef::Config.knife['supermarket_key'] || Chef::Config.client_key
+#
+#         ## Build the cookbook taball
+#         metadata = invoke(Tasks::Cookbook, :build, [cookbook], options)
+#         say_status :upload, "cookbook #{ metadata.name }@#{ metadata.version } to #{ options['site'] }"
+#
+#         metadata.archive.open('rb') do |c|
+#           http_resp = Chef::CookbookSiteStreamingUploader.post(
+#             File.join(options['site'], '/api/v1/cookbooks'),
+#             options['user'],
+#             options['key'],
+#             :tarball => c,
+#             :cookbook => { :category => '' }.to_json
+#           )
+#
+#           if http_resp.code.to_i != 201
+#             say_status :error, "Error uploading cookbook: #{ http_resp.code } #{ http_resp.message }", :red
+#             say http_resp.body
+#             exit(1)
+#           end
+#         end
+#       end
+#
+#       desc 'version COOKBOOK', 'Print the current version of a vendored cookbook'
+#       option :path, :default => Util::Cookbook::DEFAULT_VENDOR, :desc => 'Path to vendored cookbooks'
+#       def version(cookbook)
+#         Util::Cookbook.path(File.join(options['path'], cookbook))
+#         puts Util::Cookbook.metadata.version
+#       end
+#     end
+#   end
+# end

data/rvm.env

@@ -1,7 +1,7 @@
 declare -x GEM_HOME="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3"
 declare -x GEM_PATH="/home/jenkins/.rvm/gems/ruby-2.1.5@bakery-3:/home/jenkins/.rvm/gems/ruby-2.1.5@global"
 declare -x HOME="/home/jenkins"
-declare -x HUDSON_COOKIE="dfc084f6-1a14-4b8c-8779-4ebe178fd701"
+declare -x HUDSON_COOKIE="fa73e063-2dba-4b23-856a-06ccf35d11cb"
 declare -x IRBRC="/home/jenkins/.rvm/rubies/ruby-2.1.5/.irbrc"
 declare -x LANG="en_US.UTF-8"
 declare -x LC_ALL="en_US.UTF-8"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.5'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement