bosh-gen 0.1.0 → 0.2.0

data/ChangeLog.md

@@ -0,0 +1,12 @@
+# Change Log
+
+## v0.2
+
+Added:
+
+* `package`
+* `job`
+
+## v0.1
+
+* `new` - create new release

data/README.md

@@ -24,19 +24,36 @@ $ bosh-gen new my-new-project --atmos
 $ bosh-gen new my-new-project # local blobstore with a warning
 
 $ cd my-new-project
+```
+
+**NEXT:** Edit `config/final.yml` with your S3 or ATMOS credentials
+
+```
+$ bosh create release
+
+$ wget -P /tmp http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz 
+$ bosh-gen package ruby -f /tmp/ruby-1.9.3-p194.tar.gz
+
+$ bosh-gen job some-ruby-job -d ruby
+
+$ git add .
+$ git commit -m "added a job + 3 packages"
+
 $ bosh create release
 ```
 
-TODO:
+It is not ideal to include large source files, such as the 10Mb ruby tarball, in your git repository. Rather, use the blobstore for those:
 
 ```
-$ bosh-gen job somejob
-$ bosh-gen package somepackage -u somejob
-$ bosh-gen package anotherpackage
-$ bosh-gen job anotherjob -u somepackage anotherpackage
+$ rm -rf src/ruby/ruby-1.9.3-p194.tar.gz
+$ bosh add blob /tmp/ruby-1.9.3-p194.tar.gz ruby
+$ bosh upload blobs
+
+$ bosh create release
 ```
 
-This will create two jobs and two package scaffolds. Both packages will be used by `somejob`, and `anotherpackage` is used by both jobs.
+
+
 
 ## Contributing
 

data/lib/bosh/gen/cli.rb

@@ -23,7 +23,7 @@ module Bosh
       
       desc "package NAME", "Create a new package"
       method_option :dependencies, :aliases => ['-d'], :type => :array, :desc => "List of package dependencies"
-      method_option :files,        :aliases => ['-f', '--src'], :type => :array, :desc => "List of file paths to include"
+      method_option :files,        :aliases => ['-f', '--src'], :type => :array, :desc => "List of files copy into release"
       def package(name)
         dependencies = options[:dependencies] || []
         files        = options[:files] || []
@@ -33,12 +33,10 @@ module Bosh
       
       desc "job NAME", "Create a new job"
       method_option :dependencies, :aliases => ['-d'], :type => :array, :desc => "List of package dependencies"
-      method_option :templates, :aliases => ['-t'], :type => :array, :desc => "List of templates to use"
       def job(name)
         dependencies   = options[:dependencies] || []
-        template_files = options[:template_files] || []
         require 'bosh/gen/generators/job_generator'
-        Bosh::Gen::Generators::JobGenerator.start([name, dependencies, template_files])
+        Bosh::Gen::Generators::JobGenerator.start([name, dependencies])
       end
 
       no_tasks do

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

@@ -8,7 +8,6 @@ module Bosh::Gen
 
       argument :name
       argument :dependencies, :type => :array
-      argument :template_files, :type => :array
       
       def self.source_root
         File.join(File.dirname(__FILE__), "job_generator", "templates")
@@ -42,7 +41,7 @@ module Bosh::Gen
       end
       
       def job_specification
-        config = { "name" => name, "packages" => dependencies, "templates" => template_files }
+        config = { "name" => name, "packages" => dependencies, "templates" => {} }
         create_file job_dir("spec"), YAML.dump(config)
       end
       

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

@@ -26,7 +26,7 @@ module Bosh::Gen
       end
       
       def blobs_yaml
-        create_file "blob_index.yml", YAML.dump({})
+        create_file "config/blobs.yml", YAML.dump({})
       end
       
       # TODO - support other blobstores
@@ -34,28 +34,30 @@ module Bosh::Gen
         config_dev = { "dev_name" => name }
         create_file "config/dev.yml", YAML.dump(config_dev)
 
+        config_private = { "blobstore_secret" => 'BLOBSTORE_SECRET' }
+        create_file "config/private.yml", YAML.dump(config_private)
+
         case blobstore_type
         when :local
           say_status "warning", "config/final.yml defaulting to local blobstore /tmp/blobstore", :yellow
-          config_private = {}
           config_final = { "blobstore" => {
               "provider" => "local",
               "options" => { "blobstore_path" => '/tmp/blobstore' }
             }
           }
         when :s3
-          config_private = { "blobstore_secret" => 'AWS_SECRET_KEY' }
+          config_private = { "blobstore_secret" => 'BLOBSTORE_SECRET' }
           config_final = { "blobstore" => {
               "provider" => "s3",
               "options" => {
                 "bucket_name" => "BOSH",
                 "access_key_id" => "AWS_ACCESS_KEY",
+                "secret_access_key" => "AWS_SECRET_ACCESS_KEY",
                 "encryption_key" => "PERSONAL_RANDOM_KEY",
               }
             }
           }
         when :atmos
-          config_private = { "blobstore_secret" => 'ATMOS_SECRET_KEY' }
           config_final = { "blobstore" => {
               "provider" => "atmos",
               "options" => {
@@ -67,7 +69,6 @@ module Bosh::Gen
           }
         end
         
-        create_file "config/private.yml", YAML.dump(config_private)
         create_file "config/final.yml", YAML.dump(config_final)
       end
       

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

@@ -51,14 +51,22 @@ 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.
       def copy_src_files
-        files.each do |f|
-          copy_file File.expand_path(f), src_dir(File.basename(f))
+        files.each do |file_path|
+          file_name = File.basename(file_path)
+          src_file = src_dir(file_name)
+          if File.exist? blob_dir(file_name)
+            say "Blob '#{file_name}' exists as a blob, skipping..."
+          else
+            copy_file File.expand_path(file_path), src_file
+          end
         end
       end
       
       def package_specification
-        src_files = files.map {|f| "src/#{name}/#{File.basename(f)}"}
+        src_files = files.map {|f| "#{name}/#{File.basename(f)}"}
         config = { "name" => name, "dependencies" => dependencies, "files" => src_files }
         create_file package_dir("spec"), YAML.dump(config)
       end
@@ -72,6 +80,10 @@ module Bosh::Gen
         "src/#{name}/#{path}"
       end
       
+      def blob_dir(path)
+        "blobs/#{name}/#{path}"
+      end
+      
       # Run a command in git.
       #
       # ==== Examples

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70178189586820 !ruby/object:Gem::Requirement
+  requirement: &70119538265220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178189586820
+  version_requirements: *70119538265220
 - !ruby/object:Gem::Dependency
   name: bosh_cli
-  requirement: &70178189585400 !ruby/object:Gem::Requirement
+  requirement: &70119538264800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178189585400
+  version_requirements: *70119538264800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70178189089040 !ruby/object:Gem::Requirement
+  requirement: &70119538264380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70178189089040
+  version_requirements: *70119538264380
 description: Generators for creating BOSH releases
 email:
 - drnicwilliams@gmail.com
@@ -53,6 +53,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- ChangeLog.md
 - Gemfile
 - LICENSE
 - README.md
@@ -62,20 +63,14 @@ files:
 - lib/bosh/gen.rb
 - lib/bosh/gen/cli.rb
 - lib/bosh/gen/generators/job_generator.rb
-- lib/bosh/gen/generators/job_generator/templates/blobs/.gitkeep
-- lib/bosh/gen/generators/job_generator/templates/jobs/.gitkeep
-- lib/bosh/gen/generators/job_generator/templates/packages/.gitkeep
-- lib/bosh/gen/generators/job_generator/templates/src/.gitkeep
+- lib/bosh/gen/generators/job_generator/templates/.gitkeep
 - lib/bosh/gen/generators/new_release_generator.rb
 - lib/bosh/gen/generators/new_release_generator/templates/blobs/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/jobs/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/packages/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/src/.gitkeep
 - lib/bosh/gen/generators/package_generator.rb
-- lib/bosh/gen/generators/package_generator/templates/blobs/.gitkeep
-- lib/bosh/gen/generators/package_generator/templates/jobs/.gitkeep
-- lib/bosh/gen/generators/package_generator/templates/packages/.gitkeep
-- lib/bosh/gen/generators/package_generator/templates/src/.gitkeep
+- lib/bosh/gen/generators/package_generator/templates/.gitkeep
 - lib/bosh/gen/version.rb
 homepage: https://github.com/drnic/bosh-gen
 licenses: []
@@ -91,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4165498384782219336
+      hash: 1548629976559305744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4165498384782219336
+      hash: 1548629976559305744
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17