bosh-gen 0.4.0 → 0.5.0

data/ChangeLog.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.5.0
+
+* `job` - takes a COMMAND argument
+* `source --blob/-b` - file stored in blobs/ folder instead of src/
+* `source` - packaging script includes standard configure/make/make install if .tar.gz or .tgz
+
 ## v0.4
 
 * `job` - added --ruby flag to include a ruby/rack-specifc ctl script

data/lib/bosh/gen/cli.rb

@@ -33,27 +33,34 @@ module Bosh
       end
       
       desc "source NAME", "Downloads a source item into the named project"
+      method_option :blob, :aliases => ['-b'], :type => :boolean, :desc => "Store file in blobstore"
       def source(name, uri)
+        flags = { :blob => options[:blob] || false }
         dir = Dir.mktmpdir
         files = []
-        say "Downloading #{uri}..."
-        FileUtils.chdir(dir) do
-          `wget '#{uri}'`
-          files = Dir['*'].map {|f| File.expand_path(f)}
+        if File.exist?(uri)
+          files = [uri]
+        else
+          say "Downloading #{uri}..."
+          FileUtils.chdir(dir) do
+            `wget '#{uri}'`
+            files = Dir['*'].map {|f| File.expand_path(f)}
+          end
         end
 
         require 'bosh/gen/generators/package_source_generator'
-        Bosh::Gen::Generators::PackageSourceGenerator.start([name, files])
+        Bosh::Gen::Generators::PackageSourceGenerator.start([name, files, flags])
       end
       
-      desc "job NAME", "Create a new job"
+      desc "job NAME COMMAND", "Create a new job to run 'COMMAND' to launch the process"
       method_option :dependencies, :aliases => ['-d'], :type => :array, :desc => "List of package dependencies"
       method_option :ruby, :type => :boolean, :desc => "Use templates for running Ruby/Rack process"
-      def job(name)
+      def job(name, command=nil)
+        command ||= 'EXECUTABLE_SERVER'
         flags = { :ruby => options["ruby"] || false }
         dependencies   = options[:dependencies] || []
         require 'bosh/gen/generators/job_generator'
-        Bosh::Gen::Generators::JobGenerator.start([name, dependencies, flags])
+        Bosh::Gen::Generators::JobGenerator.start([name, command, dependencies, flags])
       end
       
       desc "template JOB FILE_PATH", "Add a Job template (example FILE_PATH: config/httpd.conf)"

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

@@ -7,6 +7,7 @@ module Bosh::Gen
       include Thor::Actions
 
       argument :job_name
+      argument :command
       argument :dependencies, :type => :array
       argument :flags, :type => :hash
       

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

@@ -12,9 +12,9 @@
 #
 # Clear logs:
 # jobs/<%= job_name %>/templates/<%= job_name %>_ctl clearlogs
-
+<% if command == "EXECUTABLE_SERVER" %>
 # TODO - change "EXECUTABLE_SERVER" to the command to run
-
+<% end %>
 RUN_DIR=/var/vcap/sys/run/<%= job_name %>
 LOG_DIR=/var/vcap/sys/log/<%= job_name %>
 STORE=/var/vcap/store/<%= job_name %>
@@ -22,7 +22,7 @@ PIDFILE=$RUN_DIR/<%= job_name %>.pid
 
 export PATH=/var/vcap/packages/ruby/bin:$PATH
 
-COMMAND=${COMMAND:-/var/vcap/packages/<%= job_name %>/bin/EXECUTABLE_SERVER}
+COMMAND=${COMMAND:-/var/vcap/packages/<%= job_name %>/bin/<%= command %>}
 HOME=${HOME:-/home/vcap}
 
 case $1 in

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

@@ -8,6 +8,7 @@ module Bosh::Gen
 
       argument :package_name
       argument :file_paths
+      argument :flags, :type => :hash
       
       def check_root_is_release
         unless File.exist?("jobs") && File.exist?("packages")
@@ -36,13 +37,46 @@ module Bosh::Gen
         end
       end
       
+      # Add a guess about the packaging/compilation of the file
+      def packaging
+        packaging_for_files = ""
+        file_paths.each do |path|
+          filename = File.basename(path)
+          if filename =~ /^(.*)(\.tar\.gz|\.tgz)$/
+            package_dir = $1
+            # assume its a standard installable source package
+            packaging_for_files += <<-BASH.gsub(/^\s{12}/, '')
+            tar xfz #{package_name}/#{filename}
+            (
+              cd #{package_dir}
+              ./configure --prefix=$BOSH_INSTALL_TARGET
+              make
+              make install
+            )
+            
+            BASH
+          end
+        end
+        append_file "packages/#{package_name}/packaging", packaging_for_files
+      end
+      
+      def readme
+        if flags[:blob]
+          say_status "readme", "Upload blobs with 'bosh upload blobs'"
+        end
+      end
+      
       private
       def package_dir(path)
         File.join("packages", package_name, path)
       end
 
       def source_dir(path)
-        File.join("src", package_name, path)
+        if flags[:blob]
+          File.join("blobs", package_name, path)
+        else
+          File.join("src", package_name, path)
+        end
       end
     end
   end

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3504528361068900288
+      hash: -3354968755098444003
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3504528361068900288
+      hash: -3354968755098444003
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23