bosh-gen 0.8.0 → 0.8.1

data/ChangeLog.md

@@ -21,6 +21,13 @@ make
 make install
 ```
 
+### v0.8.1
+
+Changed:
+
+* `extract-job` & `extract-pkg` - copies files mentioned in specs
+* `package` - large files go into blobs/ folder
+
 ## v0.7.0
 
 Added:

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

@@ -31,14 +31,20 @@ module Bosh::Gen
       def copy_dependent_packages
         @packages.each {|package| directory "packages/#{package}"}
       end
-
-      def copy_dependent_sources
+      
+      def copy_package_spec_files
         @blobs = false
         @packages.each do |package|
-          directory "src/#{package}" if File.exist?(File.join(source_release_path, "src", package))
-          if File.exist?(File.join(source_release_path, "blobs", package))
-            directory "blobs/#{package}"
-            @blobs = true
+          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}"
+              @blobs = true
+            end
           end
         end
       end
@@ -54,6 +60,9 @@ module Bosh::Gen
         File.join("jobs", job_name, path)
       end
       
+      def source_file(*path)
+        File.join(source_release_path, *path)
+      end
     end
   end
 end

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

@@ -30,13 +30,19 @@ module Bosh::Gen
         @packages.each {|package| directory "packages/#{package}"}
       end
 
-      def copy_dependent_sources
+      def copy_package_spec_files
         @blobs = false
         @packages.each do |package|
-          directory "src/#{package}" if File.exist?(File.join(source_release_path, "src", package))
-          if File.exist?(File.join(source_release_path, "blobs", package))
-            directory "blobs/#{package}"
-            @blobs = true
+          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}"
+              @blobs = true
+            end
           end
         end
       end

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

@@ -9,21 +9,23 @@ module Bosh::Gen
       argument :name
       argument :dependencies, :type => :array
       argument :files, :type => :array
-      
+
+      BLOB_FILE_MIN_SIZE=20_000 # files over 20k are blobs
+
       def self.source_root
         File.join(File.dirname(__FILE__), "package_generator", "templates")
       end
-      
+
       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_name
         raise Thor::Error.new("'#{name}' is not a vaild BOSH id") unless name.bosh_valid_id?
       end
-      
+
       def warn_missing_dependencies
         dependencies.each do |d|
           raise Thor::Error.new("dependency '#{d}' is not a vaild BOSH id") unless d.bosh_valid_id?
@@ -32,7 +34,7 @@ module Bosh::Gen
           end
         end
       end
-      
+
       def packaging
         create_file package_dir("packaging") do
           packaging = <<-SHELL.gsub(/^\s{10}/, '')
@@ -72,16 +74,30 @@ module Bosh::Gen
         end
       end
 
-      # Copy the local source files into src/NAME/filename, unless filename
-      # already exists as a blob in blobs/NAME/filename.
+      # Copy the local source files into src or blobs
+      # * into src/NAME/filename (if < 20k) or
+      # * into blobs/NAME/filename (if >= 20k)
+      # Skip a file if:
+      # * filename already exists as a blob in blobs/NAME/filename
+      # * file doesn't exist
       def copy_src_files
-        files.each do |file_path|
+        files.each do |file|
+          file_path = File.expand_path(file)
+          unless File.exist?(file_path)
+            say "Skipping unknown file #{file_path}", :red
+            next
+          end
+          
+          size      = File.size(file_path)
           file_name = File.basename(file_path)
-          src_file = src_dir(file_name)
-          if File.exist? blob_dir(file_name)
+          src_file  = src_dir(file_name)
+          blob_file = blob_dir(file_name)
+          if File.exist?(blob_file)
             say "Blob '#{file_name}' exists as a blob, skipping..."
           else
-            copy_file File.expand_path(file_path), src_file
+            # if < 20k, put in src/, else blobs/
+            target = size >= BLOB_FILE_MIN_SIZE ? blob_file : src_file
+            copy_file File.expand_path(file_path), target
           end
         end
       end
@@ -125,7 +141,7 @@ module Bosh::Gen
 
       # Returns all .tar.gz in the files list
       def tarballs_in_files
-        files.select { |file| file =~ /.tar.gz/  }
+        files.select { |file| file =~ /.(?:tar.gz|tgz)/  }
       end
 
       # If primary_package_file was mysql's client-5.1.62-rel13.3-435-Linux-x86_64.tar.gz

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3406333594034376682
+      hash: 3642309180596894033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3406333594034376682
+      hash: 3642309180596894033
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24