batali 0.3.14 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56e09e21e418f24e83792d17a8c9498c0b46a2df
-  data.tar.gz: 0590ade5cc488326df250797dcffc72820c49245
+  metadata.gz: 0415b35e7fad280740b21548ef140b5c12f98c96
+  data.tar.gz: 4afcc45cb368ebf1c156f0b9d96aa0f33ebb0ce1
 SHA512:
-  metadata.gz: f82d8b530f540eeed8436fef0f84f84dadbdea515ef757516a6f50f5c6ed64964ebed25293a5babd6895a2bb3e881b6e82e72e0b8d50201af202f58b27e973c1
-  data.tar.gz: 9d322ab00a9088b89b5f78c2bf0745588f8ff294676b03a9737df32d1eeb97df560e3efb74d6d265acb6201a6a90b6a7f8a6224f3cd916b3f93751c7c566dd87
+  metadata.gz: 567206dc928b7c3040bafe757ac18565a932c822f0d8d4301ec611035c01bcf773f4b982c52c7b2333432c8f5bebd9e45027e406c6bc1aef99736f8323a5e0d1
+  data.tar.gz: 9ecde47ac49072af4a436a39b11a465f43785482980e60f74dbd51c16c6aa33127709da278f604f58c87f565222311e81e0f30493ba123a55e00614a18cfd23d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.4.0
+* [feature] Add `supermarket` command for static repository generation
+
 # v0.3.14
 * [enhancement] Use threads when installing cookbooks (#72 thanks @sawanoboly!)
 

data/README.md

@@ -425,6 +425,31 @@ within the `batali.manifest` file. If cookbooks are defined within the
 `batali.manifest` file that have not been uploaded to the Chef server, those
 cookbooks will be uploaded.
 
+## Supermarket
+
+Batali can generate a static supermarket repository from a `batali.manifest`. The resultant
+directory can then be hosted with an httpd of choice. To generate a supermarket repository,
+first run `resolve`:
+
+```
+$ batali resolve
+```
+
+Next, run the `supermarket` command to generate the repository:
+
+```
+$ batali supermarket
+```
+
+A new directory will be created (`./supermarket`) which contains the newly generated
+supermarket respository. The generated `universe` file will contain URLs pointing
+to `localhost`, which is the default behavior. In practice, it will be desirable to
+update the URL to provide the customized location:
+
+```
+$ batali supermarket --remote-supermarket-url="http://supermarket.example.com"
+```
+
 # Info
 
 * Repository: https://github.com/hw-labs/batali

data/bin/batali

@@ -80,4 +80,24 @@ Bogo::Cli::Setup.define do
     end
   end
 
+  command 'supermarket' do
+    description 'Generate a supermarket'
+    self.instance_exec(&global_opts)
+    on :p, 'path=', 'Cookbook install path'
+    on :I, 'infrastructure', 'Resolve infrastructure cookbooks'
+    on :s, 'skip-install', 'Skip cookbook installation'
+    on :S, 'supermarket-path=', 'Supermarket output directory', :default => 'supermarket'
+    on :A, 'assets-path=', 'Supermarket assets storage path', :default => File.join('supermarket', 'assets')
+    on :R, 'remote-supermarket-url=', 'Custom remote supermarket URL (https://myhost.com:443/supermarket)', :default => 'http://localhost'
+    on :D, 'download-prefix=', 'Remote location prefixed to asset name', :default => '/assets'
+    on :T, 'location-type=', 'Name of location type', :default => 'batali'
+    on :P, 'pretty-universe', 'Output formatted universe JSON'
+    on :U, 'universe-only', 'Only generate the supermarket universe.json file'
+    on :C, 'clean-assets', 'Replace any existing compressed assets'
+
+    run do |opts, args|
+      Batali::Command::Supermarket.new(opts, args).execute!
+    end
+  end
+
 end

data/lib/batali/command/supermarket.rb

@@ -0,0 +1,141 @@
+require 'batali'
+require 'rubygems/package'
+require 'zlib'
+
+module Batali
+  class Command
+    # Generate a supermarket
+    class Supermarket < Batali::Command
+
+      # Generate supermarket
+      def execute!
+        ui.info "Batali supermarket generator #{ui.color('started', :bold)}"
+        if(config[:skip_install])
+          ui.warn 'Skipping cookbook installation.'
+        else
+          Install.new(config.merge(:ui => ui, :install => {}), arguments).execute!
+        end
+        run_action 'Prepare supermarket destination directory' do
+          FileUtils.mkdir_p(File.join(config[:supermarket_path], 'api', 'v1', 'cookbooks'))
+          FileUtils.mkdir_p(config[:assets_path])
+          nil
+        end
+        new_universe = new_universe_file = universe_diff = nil
+        run_action 'Generate supermarket universe.json file' do
+          new_universe, new_universe_file = generate_universe
+          nil
+        end
+        unless(config[:universe_only])
+          if(config[:clean_assets])
+            Dir.glob(File.join(config[:assets_path], '*')).each do |old_asset|
+              FileUtils.rm(old_asset)
+            end
+          end
+          new_assets = generate_cookbook_assets
+          valid_items = new_universe.values.map(&:values).flatten.map do |info|
+            File.basename(info[:download_url])
+          end
+          prune_universe(valid_items)
+          populate_universe(valid_items)
+        end
+        run_action 'Write supermarket universe file' do
+          FileUtils.cp(
+            new_universe_file.path,
+            File.join(config[:supermarket_path], 'universe')
+          )
+          FileUtils.chmod(0644, File.join(config[:supermarket_path], 'universe'))
+          new_universe_file.delete
+          nil
+        end
+        ui.info "Batali supermarket generator #{ui.color('complete!', :bold, :green)}"
+        ui.puts "  Supermarket content written to: #{config[:supermarket_path]}"
+      end
+
+      # Generate compressed cookbook assets
+      def generate_cookbook_assets
+        manifest.cookbook.map do |ckbk|
+          base_name = "#{ckbk.name}-#{ckbk.version}.tgz"
+          ckbk_name = infrastructure? ? "#{ckbk.name}-#{ckbk.version}" : ckbk.name
+          tar_ckbk_name = "#{ckbk.name}-#{ckbk.version}"
+          ckbk_content_path = File.join('cookbooks', ckbk_name)
+          ckbk_path = File.join(config[:assets_path], base_name)
+          unless(File.exist?(ckbk_path))
+            ckbk_io = File.open(ckbk_path, 'wb')
+            gz_io = Zlib::GzipWriter.new(ckbk_io, Zlib::BEST_COMPRESSION)
+            begin
+              gz_io.mtime = Time.now
+              Gem::Package::TarWriter.new(gz_io) do |tar|
+                unless(File.directory?(ckbk_content_path))
+                  raise "Cookbook path not found! Run `install`. (#{ckbk_content_path})"
+                end
+                Dir.glob(File.join(ckbk_content_path, '**', '**', '*')).each do |c_file|
+                  next unless File.file?(c_file)
+                  stat = File.stat(c_file)
+                  c_path = c_file.sub(File.join(ckbk_content_path, ''), '')
+                  tar.add_file_simple(File.join(tar_ckbk_name, c_path), stat.mode, stat.size) do |dst|
+                    File.open(c_file, 'rb') do |src|
+                      until(src.eof?)
+                        dst.write src.read(4096)
+                      end
+                    end
+                  end
+                end
+              end
+            ensure
+              gz_io.close
+            end
+            base_name
+          end
+        end.compact
+      end
+
+      # Prune assets from universe
+      #
+      # @param items [Array<String>] names of assets
+      # TODO: This is a stub for custom action
+      def prune_universe(items)
+      end
+
+      # Add assets to universe
+      #
+      # @param items [Array<String>] names of assets
+      # TODO: This is a stub for custom action
+      def populate_universe(items)
+      end
+
+      # Generate the supermarket universe.json file
+      #
+      # @return [Smash, File] universe content hash, universe file
+      def generate_universe
+        universe = Smash.new.tap do |uni|
+          manifest.cookbook.each do |ckbk|
+            uni.set(ckbk.name, ckbk.version.to_s,
+              Smash.new(
+                :location_type => config[:location_type],
+                :location_path => File.join(config[:remote_supermarket_url], 'api', 'v1'),
+                :download_url => File.join(
+                  config[:remote_supermarket_url],
+                  config[:download_prefix],
+                  "#{ckbk.name}-#{ckbk.version}.tgz"
+                ),
+                :dependencies => Smash[
+                  ckbk.dependencies.map do |dep|
+                    [dep.name, dep.requirement]
+                  end
+                ]
+              )
+            )
+          end
+        end
+
+        new_universe_file = Tempfile.new('batali-universe')
+        new_universe_file.puts MultiJson.dump(universe, :pretty => !!config[:pretty_universe])
+        new_universe_file.flush
+        new_universe_file.rewind
+        [universe, new_universe_file]
+      end
+
+    end
+
+  end
+end

data/lib/batali/command.rb

@@ -14,6 +14,7 @@ module Batali
     autoload :Display, 'batali/command/display'
     autoload :Install, 'batali/command/install'
     autoload :Resolve, 'batali/command/resolve'
+    autoload :Supermarket, 'batali/command/supermarket'
     autoload :Update, 'batali/command/update'
 
     # Set UI when loading via command

data/lib/batali/origin/remote_site.rb

@@ -10,7 +10,7 @@ module Batali
     class RemoteSite < Origin
 
       # Site suffix for API endpoint
-      COOKBOOK_API_SUFFIX = 'api/v1/cookbooks'
+      API_SUFFIX = 'api/v1/'
 
       include Bogo::Memoization
 
@@ -22,7 +22,8 @@ module Batali
 
       def initialize(*_)
         super
-        endpoint = URI.join(self.endpoint, COOKBOOK_API_SUFFIX).to_s
+        # NOTE: We currently don't require API_SUFFIX information
+        # self.endpoint = URI.join(endpoint, API_SUFFIX).to_s
         self.identifier = Digest::SHA256.hexdigest(endpoint)
         unless(name?)
           self.name = identifier

data/lib/batali/version.rb

@@ -1,5 +1,5 @@
 # Batali namespace
 module Batali
   # Current version
-  VERSION = Gem::Version.new('0.3.14')
+  VERSION = Gem::Version.new('0.4.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -220,6 +220,7 @@ files:
 - lib/batali/command/display.rb
 - lib/batali/command/install.rb
 - lib/batali/command/resolve.rb
+- lib/batali/command/supermarket.rb
 - lib/batali/command/update.rb
 - lib/batali/config.rb
 - lib/batali/git.rb