bosh-gen 0.97.0 → 0.98.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3b7692351ac5b6596e8b513a4798897bdbc89018
-  data.tar.gz: c2c2156c41a4127e0f4ab4a918f71d7ac18c2f7f
+SHA256:
+  metadata.gz: ae99e485c6d1ef012fa9791ea824916de6553b86fc1652876336e72a215bfd94
+  data.tar.gz: 5db89e28546f43d7e7f53c4bb37f3fa06244fb3925eab0a57606f9dcb6190c82
 SHA512:
-  metadata.gz: 4f4f02ce3983d769d5ee81e239f89f05daf823d44b394e2f5635e73322d05fa9b91a0b37ae6acdb46f887e560bf8ded11c31d024900a5253a0e96c7de9b20ab1
-  data.tar.gz: 2f7fe7100365e577267af10cfa69c4fa7ec5b56da1134db7130b5664038bb2f5c62d862b3a56d5fd590958ed9b7eb1b0c592265742e73b4e653f9aa05639c6f5
+  metadata.gz: f6e40d20102695231c3d30a40bb4b4eb5a193a502837c89b0c010f3c21e09d59a78972e42c3549bfa39d89380e84b75a9c65f94791a293a7bd3f4a5953e68f5a
+  data.tar.gz: 955dd272544f9cbdb11924a71408fdfa7bd928b4b9d5da8f90131282dddef0c4cfa9afcbea4ce4b534549e0b715dc4ea52970fdc61c55b542730d5d39da8127d

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

@@ -60,8 +60,11 @@ module Bosh::Gen
           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))
+              if target_path = source_path.scan(%r{/blobs/(.*)}).flatten.first
+                copy_file(File.join("src", target_path))
+              else
+                puts("Failed to copy file: #{source_path}")
+              end
             end
           end
 

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

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'json'
 require 'thor/group'
 
 module Bosh::Gen

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_bpm/spec.tt

@@ -1,7 +1,7 @@
 ---
 name: <%= job_name %>
 
-packages: []
+packages: <%= dependencies.to_json %>
 templates:
   config/bpm.yml: config/bpm.yml
 

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_simple/spec.tt

@@ -1,7 +1,7 @@
 ---
 name: <%= job_name %>
 
-packages: []
+packages: <%= dependencies.to_json %>
 templates:
   bin/ctl: bin/ctl
   bin/monit_debugger: bin/monit_debugger

data/lib/bosh/gen/generators/new_release_generator/templates/manifests/%project_name%.yml.tt

@@ -35,7 +35,7 @@ update:
 
 releases:
 - name: bpm
-  version: 0.2.0
+  version: 0.5.0
   url: git+https://github.com/cloudfoundry-incubator/bpm-release
 - name: <%= project_name %>
   version: latest # TODO: update after first final release

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

@@ -53,7 +53,11 @@ module Bosh::Gen
           
           SHELL
 
-          dependencies.each do |package|
+          language_packs.each do |package|
+            packaging << "source /var/vcap/packages/#{package}/bosh/compile.env\n"
+          end
+
+          simple_dependencies.each do |package|
             packaging << "PATH=/var/vcap/packages/#{package}/bin:$PATH\n"
           end
 
@@ -104,7 +108,7 @@ module Bosh::Gen
       def package_specification
         src_files = 
           files.map {|f| "#{name}/#{File.basename(f)}"} + # new blobs
-          existing_sources                                # existing files/sources, like 'myapp/**/*'
+          existing_sources_as_globs                       # existing directories, like 'myapp'
         config = { "name" => name, "dependencies" => dependencies, "files" => src_files }
         create_file package_dir("spec"), YAML.dump(config)
       end
@@ -163,6 +167,19 @@ module Bosh::Gen
         archives
       end
 
+      def language_packs
+        dependencies.select do |dep|
+          File.exist?(File.join("packages", dep, "spec.lock"))
+        end
+      end
+
+      # dependencies that are not language_packs
+      def simple_dependencies
+        dependencies.select do |dep|
+          !File.exist?(File.join("packages", dep, "spec.lock"))
+        end
+      end
+
       # Returns all .tar.gz in the files list
       def tarballs_in_files
         files.select { |file| file =~ /\.(?:tar.gz|tgz)/  }
@@ -172,6 +189,16 @@ module Bosh::Gen
       def zipfiles_in_files
         files.select { |file| file =~ /\.zip/  }
       end
+
+      def existing_sources_as_globs
+        existing_sources.map do |src|
+          if File.directory?(File.join("src", src))
+            "#{src}/**/*"
+          else
+            src
+          end
+        end
+      end
       
       # If primary_package_file was mysql's client-5.1.62-rel13.3-435-Linux-x86_64.tar.gz
       # then returns "client-5.1.62-rel13.3-435-Linux-x86_64"

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.97.0"
+    VERSION = "0.98.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.97.0
+  version: 0.98.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ''