builderator 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48baf4bb78a9121f6268913550ac1cdf5157aa1c
-  data.tar.gz: 761c4a044264ad1109a534ab41a382076d2298bc
+  metadata.gz: 9f78cc9361223078843608c192a703626a438855
+  data.tar.gz: c1404434a5bffd2b5a4ed75e1162023cd978f04e
 SHA512:
-  metadata.gz: 988210a27ccc466c5b0d1fa5548aae42524043b6c31fe290cbbf27e2d13d42f094b1552662befa899c7b047906b60e9153e71afb88598b3d2598ae5c337b5bbd
-  data.tar.gz: 20a6c23658cd4e12f583319512b42609fe6aa5fb0f894d56d01283248839c9f97223aaf69a22c381d6f573de514e41a2619f5b7799c8e9706349783e37ff318b
+  metadata.gz: 8e337ea2b012c56e13778e3ad866636c84029a5df410bd38ff1ffc55b9ef2d5732d584277b37010ee70b9de053e2805ab476836707f548e410529f471e93a27b
+  data.tar.gz: a4d1dd644c7a958fbc2d08d55d226441874d51b0844ccea47c3613e5120e618da5d87904145208bc901899e6ad23e38cc5fbf089c069955bd3d86d57e85cffe5

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/builderator.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bundler', '~> 1.7.0'
   spec.add_dependency 'berkshelf', '~> 3.2'
   spec.add_dependency 'chef', '~> 12.0'
+  spec.add_dependency 'ignorefile'
   spec.add_dependency 'thor', '~> 0.19.0'
   spec.add_dependency 'thor-scmversion', '1.7.0'
 end

data/lib/builderator/tasks/cookbook.rb

@@ -1,5 +1,12 @@
+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
@@ -13,22 +20,82 @@ module Builderator
       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
 
-        create_file File.join(Util::Cookbook.path, 'metadata.json'),
-                    Util::Cookbook.metadata.to_json, :force => true
+        metadata
       end
 
-      desc 'package PATH', 'Package a cookbook into a tarball'
-      def package(cookbook = nil)
+      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 'publish', 'Publish a cookbook to supermarket.chef.io'
-      def publish(cookbook = nil)
+      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'

data/lib/builderator/util.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Builderator
   module Util
     class << self
@@ -43,7 +45,7 @@ module Builderator
       end
 
       def working_dir(relative = '.')
-        File.expand_path(relative, Dir.pwd)
+        Pathname.pwd.join(relative).expand_path
       end
     end
   end

data/lib/builderator/util/cookbook.rb

@@ -1,5 +1,5 @@
 require 'chef/cookbook/metadata'
-require 'thor-scmversion'
+require 'ignorefile'
 
 require_relative '../util'
 
@@ -8,28 +8,73 @@ module Builderator
     module Cookbook
       DEFAULT_VENDOR = Util.working_dir('vendor/chef/cookbooks')
 
+      ## Don't vendor VCS files.
+      ## Reference GNU tar --exclude-vcs: https://www.gnu.org/software/tar/manual/html_section/tar_49.html
+      ## Boosted from https://github.com/berkshelf/berkshelf/blob/master/lib/berkshelf/berksfile.rb
+      EXCLUDED_VCS_FILES = [
+        '.arch-ids', '{arch}', '.bzr', '.bzrignore', '.bzrtags',
+        'CVS', '.cvsignore', '_darcs', '.git', '.hg', '.hgignore',
+        '.hgrags', 'RCS', 'SCCS', '.svn', '**/.git', '.temp'].freeze
+
+      class Metadata < Chef::Cookbook::Metadata
+        def files
+          return @files unless @files.nil?
+
+          @files ||= Pathname.glob(Util::Cookbook.path.join('**/{*,.*}'))
+          ignorefile.apply!(@files)
+
+          @files
+        end
+
+        def archive
+          Util.working_dir("#{ name }-#{ version }.tgz")
+        end
+
+        def chefignore
+          Util::Cookbook.path.join('chefignore')
+        end
+
+        def gitignore
+          Util.working_dir('.gitignore')
+        end
+
+        def ignorefile
+          return @ignorefile unless @ignorefile.nil?
+
+          ## Construct an ignorefile
+          @ignorefile = IgnoreFile.new(Util::Cookbook::EXCLUDED_VCS_FILES)
+          @ignorefile.load_file(chefignore)
+          @ignorefile.load_file(gitignore)
+        end
+      end
+
       class << self
         def path(arg = nil)
           ## Set an explicit path to a cookbook
-          return @path = arg unless arg.nil?
+          return @path = Pathname.new(arg) unless arg.nil?
           return @path unless @path.nil?
 
           ## Check for an embedded cookbook? ('./cookbook')
-          return @path = Util.working_dir('cookbook') if File.exist?(Util.working_dir('cookbook'))
+          return @path = Util.working_dir('cookbook') if Util.working_dir('cookbook').exist?
+
           @path = Util.working_dir
         end
 
+        def archive_path(metadata, file)
+          Pathname.new(metadata.name).join(Pathname.new(file).relative_path_from(path))
+        end
+
         def berksfile
-          File.join(path, 'Berksfile')
+          path.join('Berksfile')
         end
 
         def metadata
-          Chef::Cookbook::Metadata.new.tap do |c|
-            if File.exist?(File.join(path, 'metadata.rb'))
-              c.from_file(File.join(path, 'metadata.rb'))
+          Metadata.new.tap do |c|
+            if path.join('metadata.rb').exist?
+              c.from_file(path.join('metadata.rb').to_s)
 
-            elsif File.exist?(File.join(path, 'metadata.json'))
-              c.from_json(IO.read(File.join(path, 'metadata.json')))
+            elsif path.join('metadata.json').exist?
+              c.from_json(path.join('metadata.json').to_s)
 
             else
               fail IOError, 'Unable to read metadata.rb or metadata.json!'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: ignorefile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement