bosh-gen 0.2.0 → 0.3.0

data/ChangeLog.md

@@ -1,11 +1,18 @@
 # Change Log
 
+## v0.3
+
+Added:
+
+* `template` - add a template/file to a job
+* `source` - download and add a source file/tarball to a package
+
 ## v0.2
 
 Added:
 
-* `package`
-* `job`
+* `package` - create package scaffold, including source files
+* `job` - create job scaffold
 
 ## v0.1
 

data/README.md

@@ -52,6 +52,13 @@ $ bosh upload blobs
 $ bosh create release
 ```
 
+Your job may need additional configuration files or executables installed.
+
+```
+$ bosh-gen template some-ruby-job config/some-config.ini
+    create  jobs/some-ruby-job/templates/some-config.ini.erb
+     force  jobs/some-ruby-job/spec
+```
 
 
 

data/lib/bosh/gen/cli.rb

@@ -31,6 +31,20 @@ module Bosh
         Bosh::Gen::Generators::PackageGenerator.start([name, dependencies, files])
       end
       
+      desc "source NAME", "Downloads a source item into the named project"
+      def source(name, uri)
+        dir = Dir.mktmpdir
+        files = []
+        say "Downloading #{uri}..."
+        FileUtils.chdir(dir) do
+          `wget '#{uri}'`
+          files = Dir['*'].map {|f| File.expand_path(f)}
+        end
+
+        require 'bosh/gen/generators/package_source_generator'
+        Bosh::Gen::Generators::PackageSourceGenerator.start([name, files])
+      end
+      
       desc "job NAME", "Create a new job"
       method_option :dependencies, :aliases => ['-d'], :type => :array, :desc => "List of package dependencies"
       def job(name)
@@ -38,7 +52,13 @@ module Bosh
         require 'bosh/gen/generators/job_generator'
         Bosh::Gen::Generators::JobGenerator.start([name, dependencies])
       end
-
+      
+      desc "template JOB FILE_PATH", "Add a Job template (example FILE_PATH: config/httpd.conf)"
+      def template(job_name, file_path)
+        require 'bosh/gen/generators/job_template_generator'
+        Bosh::Gen::Generators::JobTemplateGenerator.start([job_name, file_path])
+      end
+      
       no_tasks do
         def cyan; "\033[36m" end
         def clear; "\033[0m" end

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

@@ -33,7 +33,7 @@ module Bosh::Gen
       end
       
       def templates
-        empty_directory job_dir("template")
+        empty_directory job_dir("templates")
       end
       
       def monit

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

@@ -0,0 +1,56 @@
+require 'yaml'
+require 'thor/group'
+
+module Bosh::Gen
+  module Generators
+    class JobTemplateGenerator < Thor::Group
+      include Thor::Actions
+
+      argument :job_name
+      argument :file_path
+      
+      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_job
+        raise Thor::Error.new("'#{job_name}' job does not yet exist; either create or fix spelling") unless File.exist?(job_dir(""))
+        raise Thor::Error.new("'jobs/#{job_name}/spec' is missing") unless File.exist?(job_dir("spec"))
+      end
+      
+      def check_file_path
+        raise Thor::Error.new("'#{file_path}' must be a relative path, such as 'config/httpd.conf'") if file_path[0] == "/"
+      end
+
+      def touch_template_erb
+        create_file job_template_dir(template_name)
+      end
+      
+      def add_template_to_spec
+        current_spec = YAML.load_file(job_dir("spec"))
+        current_spec["templates"] ||= {}
+        current_spec["templates"][template_name] = file_path
+        create_file job_dir("spec"), YAML.dump(current_spec), :force => true
+      end
+      
+      private
+      def file_name
+        File.basename(file_path)
+      end
+      
+      def template_name
+        "#{file_name}.erb"
+      end
+      
+      def job_dir(path)
+        File.join("jobs", job_name, path)
+      end
+
+      def job_template_dir(path)
+        File.join("jobs", job_name, "templates", path)
+      end
+    end
+  end
+end

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

@@ -19,6 +19,10 @@ module Bosh::Gen
         FileUtils.cd(destination_root) unless options[:pretend]
       end
       
+      def readme
+        template "README.md.tt", "README.md"
+      end
+      
       def directories
         %w[jobs packages src blobs].each do |dir|
           directory dir

data/lib/bosh/gen/generators/new_release_generator/templates/README.md.tt

@@ -0,0 +1,4 @@
+# <%= name %> - BOSH Release
+
+This project is a BOSH release for `<%= name %>`.
+

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

@@ -0,0 +1,49 @@
+require 'yaml'
+require 'thor/group'
+
+module Bosh::Gen
+  module Generators
+    class PackageSourceGenerator < Thor::Group
+      include Thor::Actions
+
+      argument :package_name
+      argument :file_paths
+      
+      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_package
+        raise Thor::Error.new("'#{package_name}' package does not yet exist; either create or fix spelling") unless File.exist?(package_dir(""))
+        raise Thor::Error.new("'packages/#{package_name}/spec' is missing") unless File.exist?(package_dir("spec"))
+      end
+      
+      def add_filenames_to_spec
+        current_spec = YAML.load_file(package_dir("spec"))
+        current_spec["files"] ||= []
+        file_paths.each do |path|
+          current_spec["files"] << File.join(package_name, File.basename(path))
+        end
+        create_file package_dir("spec"), YAML.dump(current_spec), :force => true
+      end
+      
+      def copy_files
+        source_paths << File.dirname(file_paths.first) # file_paths all in same folder
+        file_paths.each do |path|
+          copy_file path, source_dir(File.basename(path))
+        end
+      end
+      
+      private
+      def package_dir(path)
+        File.join("packages", package_name, path)
+      end
+
+      def source_dir(path)
+        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.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70119538265220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70119538265220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh_cli
-  requirement: &70119538264800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70119538264800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70119538264380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119538264380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generators for creating BOSH releases
 email:
 - drnicwilliams@gmail.com
@@ -64,13 +79,16 @@ files:
 - lib/bosh/gen/cli.rb
 - lib/bosh/gen/generators/job_generator.rb
 - lib/bosh/gen/generators/job_generator/templates/.gitkeep
+- lib/bosh/gen/generators/job_template_generator.rb
 - lib/bosh/gen/generators/new_release_generator.rb
+- lib/bosh/gen/generators/new_release_generator/templates/README.md.tt
 - 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/.gitkeep
+- lib/bosh/gen/generators/package_source_generator.rb
 - lib/bosh/gen/version.rb
 homepage: https://github.com/drnic/bosh-gen
 licenses: []
@@ -86,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1548629976559305744
+      hash: -3342967338916077757
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -95,10 +113,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1548629976559305744
+      hash: -3342967338916077757
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ''