bosh-gen 0.7.0 → 0.8.0

data/ChangeLog.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## v0.8.0
+
+Changed:
+
+* `package` - the `packaging` script include default tar/configure/make sequence for all tarballs
+
+For example, `bosh-gen package nginx -f ..../blobs/nginx/`, the resulting `packaging` is:
+
+``` bash
+set -e # exit immediately if a simple command exits with a non-zero status
+set -u # report the usage of uninitialized variables
+
+export HOME=/var/vcap
+
+tar xzf nginx/nginx-1.2.0.tar.gz
+cd nginx-1.2.0
+./configure --prefix=${BOSH_INSTALL_TARGET}
+make
+make install
+```
+
 ## v0.7.0
 
 Added:

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

@@ -35,17 +35,38 @@ module Bosh::Gen
       
       def packaging
         create_file package_dir("packaging") do
-          <<-SHELL.gsub(/^\s{10}/, '')
-          # abort script on any command that exit with a non zero value
-          set -e
+          packaging = <<-SHELL.gsub(/^\s{10}/, '')
+          set -e # exit immediately if a simple command exits with a non-zero status
+          set -u # report the usage of uninitialized variables
+          
+          export HOME=/var/vcap
           
           SHELL
+
+          dependencies.each do |package|
+            packaging << "PATH=/var/vcap/packages/#{package}/bin:$PATH\n"
+          end
+
+          tarballs_in_files.each do |tarball_file|
+            package_file = File.basename(tarball_file)
+            unpacked_path = unpacked_path_for_tarball(tarball_file)
+            
+            packaging << <<-SHELL.gsub(/^\s{12}/, '')
+            
+            tar xzf #{name}/#{package_file}
+            cd #{unpacked_path}
+            ./configure --prefix=${BOSH_INSTALL_TARGET}
+            make
+            make install
+            SHELL
+          end
+          packaging
         end
 
         create_file package_dir("pre_packaging") do
           <<-SHELL.gsub(/^\s{10}/, '')
-          # abort script on any command that exit with a non zero value
-          set -e
+          set -e # exit immediately if a simple command exits with a non-zero status
+          set -u # report the usage of uninitialized variables
           
           SHELL
         end
@@ -101,6 +122,20 @@ module Bosh::Gen
           end
         end
       end
+
+      # Returns all .tar.gz in the files list
+      def tarballs_in_files
+        files.select { |file| file =~ /.tar.gz/  }
+      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"
+      #
+      # Assumes that first line of "tar tfz TARBALL" is the unpacking path
+      def unpacked_path_for_tarball(tarball_path)
+        file = `tar tfz #{tarball_path} | head -n 1`
+        File.basename(file.strip)
+      end
     end
   end
 end

data/lib/bosh/gen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1843884671280331738
+      hash: -3406333594034376682
 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: 1843884671280331738
+      hash: -3406333594034376682
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24