jackal-stacks 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b71b344dfac97c00282df6e96bde5f3d413a74e
-  data.tar.gz: 9b787df9e775186d5333de90f3eacfd9076a1135
+  metadata.gz: f2f2bb49756a2b5a691cdbe964490bab58435cbe
+  data.tar.gz: 018332f8074dc3e57cc0c0e281ec5c81a8114015
 SHA512:
-  metadata.gz: 55393fe0bb6bfd1b26e6841eac37a4674b384560a90688bfa8094c7fc3ec01a13841cbd0ed8e265136ba90c811bd4c4c4a1cbba1ebcc4a141e88c875ede9609d
-  data.tar.gz: dadc256d8c3b29ec838e608141f4a088577ff593790c3aad5d9b22e3526136d893dc990b78f5c2e9ab897f842cd44b9ab4edfd9e41c5dbbb495f0d1101fd1df8
+  metadata.gz: 8b4ae976e2deb9347efbd8804cda61c0a01da9cadf5f6870b6fb0e6efa2fa7cff7168061bf6b96afb431747547d3ec17d3e8e72e50f3bdffdfb069cafac191c0
+  data.tar.gz: 946fec7a69dee6ab400ff6541abb345125c574c5650efde36a607659fd3aeb53372419d662fa7ac3feaffb9e768c9a323e96d1be98c298e98200e1c2ec00c760

data/CHANGELOG.md

@@ -1,2 +1,7 @@
+# v0.1.2
+* Replace librarian usage with batali
+* Perform resolution within running process
+* Include project name within stack name generated
+
 # v0.1.0
 * Initial release

data/jackal-stacks.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.description = 'Build stuff!'
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
-  s.add_dependency 'jackal'
-  s.add_dependency 'librarian-chef'
-  s.add_dependency 'sfn'
+  s.add_runtime_dependency 'jackal'
+  s.add_runtime_dependency 'batali'
+  s.add_runtime_dependency 'sfn'
   s.files = Dir['lib/**/*'] + %w(jackal-stacks.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)
 end

data/lib/jackal-stacks/builder.rb

@@ -13,6 +13,8 @@ module Jackal
         require 'bogo-ui'
         require 'stringio'
         require 'openssl'
+        require 'fileutils'
+        require 'batali'
         # Ensure we can build the API at startup
         stacks_api
       end
@@ -202,18 +204,18 @@ module Jackal
       # @param payload [Smash]
       def store_stable_asset(payload, directory)
         if(config.get(:init, :stable))
-          ['rm -rf .librarian Gemfile Gemfile.lock', 'librarian-chef install', 'rm -rf tmp'].each do |cmd|
-            info "Starting stable store pre-pack command: #{cmd}"
-            process_manager.process(payload[:id], cmd) do |process|
-              process.cwd = directory
-              process.io.inherit!
-              process.start
-              process.wait
-              unless(process.exit_code == 0)
-                raise 'Cookbook install failed!'
-              end
+          ['.batali', 'Gemfile', 'Gemfile.lock'].each do |file|
+            file_path = File.join(directory, file)
+            if(File.exists?(file_path))
+              debug "Removing file from infra directory: #{file}"
+              FileUtils.rm(file_path)
+            end
+          end
+          if(File.exists?(File.join(directory, 'batali.manifest')))
+            debug 'Installing cookbooks from Batali manifest'
+            Dir.chdir(directory) do
+              Batali::Command::Install.new({}, []).execute!
             end
-            info "Completed stable store pre-pack command: #{cmd}"
           end
           debug "Starting stable asset upload for #{payload[:id]}"
           bucket = stacks_api.api_for(:storage).buckets.get(config.get(:orchestration, :bucket_name))
@@ -221,6 +223,7 @@ module Jackal
           file = bucket.files.get(stable_name) || bucket.files.build(:name => stable_name)
           file.body = asset_store.pack(directory)
           file.save
+          debug "Completed stable asset upload for #{payload[:id]}"
         end
       end
 

data/lib/jackal-stacks/formatter/code_fetcher.rb

@@ -20,6 +20,10 @@ module Jackal
             payload.set(:data, :stacks, :reference,
               payload.get(:data, :code_fetcher, :info, :reference)
             )
+            payload.set(:data, :stacks, :project,
+              [payload.get(:data, :code_fetcher, :info, :owner),
+                payload.get(:data, :code_fetcher, :info, :name)].join('_')
+            )
           end
         end
 

data/lib/jackal-stacks/stack_common.rb

@@ -34,7 +34,12 @@ module Jackal
       # @return [String] stack name
       def stack_name(payload)
         s_namespace = determine_namespace(payload)
-        "#{s_namespace}-#{payload.get(:data, :stacks, :template).sub(/\.[a-z]+$/, '').gsub(/[^A-Za-z0-9\-]/, '-')}"
+        s_project = payload.fetch(:data, :stacks, :project, SecureRandom.urlsafe_base64)
+        [
+          s_namespace,
+          s_project,
+          payload.get(:data, :stacks, :template).sub(/\.[a-z]+$/, '')
+        ].join('-').gsub(/[^A-Za-z0-9\-]/, '-')
       end
 
     end

data/lib/jackal-stacks/version.rb

@@ -1,6 +1,6 @@
 module Jackal
   module Stacks
     # Current library version
-    VERSION = Gem::Version.new('0.1.0')
+    VERSION = Gem::Version.new('0.1.2')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-stacks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: librarian-chef
+  name: batali
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="