bosh-gen 0.92.0 → 0.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 668c75ea5ea57e96a2d20915d4d4aaecd773e3c0
-  data.tar.gz: e9bf3dc769566c2dc6b2d00e153ea76484e2ae87
+  metadata.gz: 45918f88e325e22d93f99107fdc2fead2e125813
+  data.tar.gz: 046050e3a5af22580cb57da6e3e89045f4f98763
 SHA512:
-  metadata.gz: 64875d8d16a32845aba49811e9d0f1bb7137cea9ffab4fd58f31a925f951ee2f5c81892107437e1794aa6ff43d585b99f27ecbe17b20af81b60ad8cad24fcd91
-  data.tar.gz: 8579d65a33f5450fc5822e4e81c97514a2130388a2071900072c4987da4670a151e4492f6d0b6216ecefd4b623f5965925f90a0d53b634399654e4fcee7a47a2
+  metadata.gz: 364abd05e67751691f519cc459f34d32d5988737f4961d9669228c6fa925575aee63563d11673c68a61374a65f9cda68c9748ffec2a484a0e322f8b20bc54588
+  data.tar.gz: 4ba2284c7218284b9f5dfada1fb29c7534869df3ff24f727296fd6118682465d210994862cb30be2edf2df4fcf76925845a8201ad23e11c94ee9b955f0c83fca

data/README.md

@@ -3,6 +3,6 @@ BOSH Generators
 
 Generators for creating and sharing BOSH releases.
 
-New in 0.90: `bosh2` support - single `manifests/thing.yml` deployment file
+New in 0.90: `bosh` support - single `manifests/thing.yml` deployment file
 
-NOTE: this `bosh2` branch is under construction. README will be re-written as we get towards v1.0
+NOTE: this `bosh` branch is under construction. README will be re-written as we get towards v1.0

data/lib/bosh/gen/bosh-cli-commands.rb

@@ -0,0 +1,16 @@
+module Bosh
+  module Gen
+    class BoshCli
+      # BoshCli.run("add-blob #{source_path} #{target_path}")
+      def self.run(command)
+        `#{cli_name} #{command}`
+      end
+
+      def self.cli_name
+        @@cli_name ||= begin
+          `which bosh2`.size == 0 ? "bosh" : "bosh2"
+        end
+      end
+    end
+  end
+end

data/lib/bosh/gen/cli.rb

@@ -1,5 +1,7 @@
 require "thor"
 
+require "fileutils"
+require "bosh/gen/bosh-cli-commands"
 require "bosh/gen/bosh-config"
 require "bosh/gen/core-ext"
 

data/lib/bosh/gen/generators/extract_job_generator.rb

@@ -13,20 +13,20 @@ module Bosh::Gen
           raise Thor::Error.new("run inside a BOSH release project")
         end
       end
-      
+
       def check_job_path_is_valid
         unless File.exist?(source_job_path)
           raise Thor::Error.new("source job path does not exist")
         end
       end
-      
+
       def check_job_path_is_a_job
         parent_dir = File.basename(File.dirname(source_job_path))
         unless parent_dir == "jobs"
           raise Thor::Error.new("source jobs path is not a BOSH job")
         end
       end
-      
+
       def check_job_path_within_release
         FileUtils.chdir(source_release_path) do
           unless File.exist?("jobs") && File.exist?("packages")
@@ -34,55 +34,64 @@ module Bosh::Gen
           end
         end
       end
-      
+
       def using_source_release_for_templates
         source_paths << File.join(source_release_path)
       end
 
       def copy_job_dir
-        directory "jobs/#{source_job_name}", "jobs/#{target_job_name}"
+        directory "jobs/#{source_job_name}", "jobs/#{target_job_name}", mode: :preserve
       end
-      
+
       def detect_dependent_packages
         @packages = YAML.load_file(job_dir("spec"))["packages"]
       end
-      
+
       def copy_dependent_packages
         @packages.each {|package| directory "packages/#{package}"}
       end
-      
+
       def copy_package_spec_files
         @blobs = false
         @packages.each do |package|
           spec = source_file("packages", package, "spec")
-          files = YAML.load_file(spec)["files"]
-          
-          files.each do |relative_file|
-            if File.exist?(source_file("src", relative_file))
-              copy_file "src/#{relative_file}"
-            elsif File.exist?(source_file("blobs", relative_file))
-              copy_file "blobs/#{relative_file}"
+          file_globs = YAML.load_file(spec)["files"]
+
+          file_globs.each do |file_glob|
+            source_files = Dir.glob(File.join(source_release_path, "src", file_glob))
+            source_files.each do |source_path|
+              target_path = source_path.scan(%r{/blobs/(.*)}).flatten.first
+              copy_file(File.join("src", target_path))
+            end
+          end
+
+          file_globs.each do |file_glob|
+            source_files = Dir.glob(File.join(source_release_path, "blobs", file_glob))
+            source_files.each do |source_path|
+              target_path = source_path.scan(%r{/blobs/(.*)}).flatten.first
+              BoshCli.run "add-blob #{source_path} #{target_path}"
+              say_status "add-blob", target_path
               @blobs = true
             end
           end
         end
       end
-      
+
       def readme
         if @blobs
-          say_status "readme", "Upload blobs with 'bosh upload blobs'"
+          say_status "readme", "Upload blobs with 'bosh upload-blobs'"
         end
       end
-      
+
       private
       def source_release_path
         File.expand_path(File.join(source_job_path, "..", ".."))
       end
-      
+
       def source_job_name
         File.basename(source_job_path)
       end
-      
+
       def target_job_name
         source_job_name
       end
@@ -90,7 +99,7 @@ module Bosh::Gen
       def job_dir(path="")
         File.join("jobs", target_job_name, path)
       end
-      
+
       def source_file(*path)
         File.join(source_release_path, *path)
       end

data/lib/bosh/gen/generators/extract_package_generator.rb

@@ -7,13 +7,13 @@ module Bosh::Gen
       include Thor::Actions
 
       argument :source_package_path
-      
+
       def check_root_is_release
         unless File.exist?("jobs") && File.exist?("packages")
           raise Thor::Error.new("run inside a BOSH release project")
         end
       end
-      
+
       def check_package_path_within_release
         FileUtils.chdir(source_release_path) do
           unless File.exist?("jobs") && File.exist?("packages")
@@ -21,14 +21,14 @@ module Bosh::Gen
           end
         end
       end
-      
+
       def check_package_path_is_a_package
         parent_dir = File.basename(File.dirname(source_package_path))
         unless parent_dir == "packages"
           raise Thor::Error.new("source package path is not a BOSH package")
         end
       end
-      
+
       def using_source_release_for_templates
         source_paths << File.join(source_release_path)
       end
@@ -39,51 +39,62 @@ module Bosh::Gen
         @packages = [source_package_name]
         @packages << spec["packages"] if spec["packages"]
       end
-      
+
       def copy_dependent_packages
-        @packages.each {|package| directory "packages/#{package}"}
+        @packages.each do |package|
+          directory "packages/#{package}", mode: :preserve
+        end
       end
 
       def copy_package_spec_files
         @blobs = false
         @packages.each do |package|
           spec = source_file("packages", package, "spec")
-          files = YAML.load_file(spec)["files"]
-          
-          files.each do |relative_file|
-            if File.exist?(source_file("src", relative_file))
-              copy_file "src/#{relative_file}"
-            elsif File.exist?(source_file("blobs", relative_file))
-              copy_file "blobs/#{relative_file}"
+          file_globs = YAML.load_file(spec)["files"]
+
+          file_globs.each do |file_glob|
+            source_files = Dir.glob(File.join(source_release_path, "src", file_glob))
+            source_files.each do |source_path|
+              target_path = source_path.scan(%r{/blobs/(.*)}).flatten.first
+              copy_file(File.join("src", target_path))
+            end
+          end
+
+          file_globs.each do |file_glob|
+            source_files = Dir.glob(File.join(source_release_path, "blobs", file_glob))
+            source_files.each do |source_path|
+              target_path = source_path.scan(%r{/blobs/(.*)}).flatten.first
+              BoshCli.run "add-blob #{source_path} #{target_path}"
+              say_status "add-blob", target_path
               @blobs = true
             end
           end
         end
       end
-      
+
       def readme
         if @blobs
           say_status "readme", "Upload blobs with 'bosh upload blobs'"
         end
       end
-      
+
       private
       def source_release_path
         File.expand_path(File.join(source_package_path, "..", ".."))
       end
-      
+
       def source_package_name
         File.basename(source_package_path)
       end
-      
+
       def package_dir(path="")
         File.join("packages", source_package_name, path)
       end
-      
+
       def source_package_dir(path="")
         File.join(source_release_path, "packages", source_package_name, path)
       end
-      
+
       def source_file(*path)
         File.join(source_release_path, *path)
       end

data/lib/bosh/gen/generators/new_release_generator/templates/README.md.tt

@@ -7,7 +7,7 @@ This BOSH release and deployment manifest deploy a cluster of <%= project_name %
 ```
 export BOSH_ENVIRONMENT=<bosh-alias>
 export BOSH_DEPLOYMENT=<%= project_name %>
-bosh2 deploy manifests/<%= project_name %>.yml --vars-store tmp/creds.yml
+bosh deploy manifests/<%= project_name %>.yml --vars-store tmp/creds.yml
 ```
 
 If your BOSH has Credhub, then you can omit `--vars-store` flag. It is used to generate any passwords/credentials/certificates required by `manifests/<%= project_name %>.yml`.
@@ -18,9 +18,9 @@ If your BOSH has Credhub, then you can omit `--vars-store` flag. It is used to g
 As a developer of this release, create new releases, upload and deploy them:
 
 ```
-bosh2 create-release --force && \
-  bosh2 -n upload-release && \
-  bosh2 deploy manifests/<%= project_name %>.yml --vars-store tmp/creds.yml
+bosh create-release --force && \
+  bosh -n upload-release && \
+  bosh deploy manifests/<%= project_name %>.yml --vars-store tmp/creds.yml
 ```
 
 If your BOSH has Credhub, then you can omit `--vars-store` flag. It is used to generate any passwords/credentials/certificates required by `manifests/<%= project_name %>.yml`.

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.92.0"
+    VERSION = "0.93.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.92.0
+  version: 0.93.0
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -159,6 +159,7 @@ files:
 - bin/bosh-gen
 - bosh-gen.gemspec
 - lib/bosh/gen.rb
+- lib/bosh/gen/bosh-cli-commands.rb
 - lib/bosh/gen/bosh-config.rb
 - lib/bosh/gen/cli.rb
 - lib/bosh/gen/core-ext.rb