bosh-gen 0.6.2 → 0.7.0

data/ChangeLog.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## v0.7.0
+
+Added:
+
+* `extract-pkg` - extract a package and its dependencies from a target release
+
+Changed/Renamed:
+
+* `extract` -> `extract-job`
+* `new` -> `.gitignore` includes `.vagrant`, to support `bosh-solo`
+* `manifest` -> update to soon-to-be-released stemcell 0.6.2
+
 ## v0.6.0
 
 Added:

data/lib/bosh/gen/cli.rb

@@ -69,13 +69,19 @@ module Bosh
         Bosh::Gen::Generators::JobTemplateGenerator.start([job_name, file_path])
       end
       
-      desc "extract SOURCE_RELEASE_PATH SOURCE_JOB_NAME [JOB_NAME]", "Extracts a job from another release and all its dependent packages and source"
-      def extract(source_release_path, source_job_name, target_job_name=nil)
+      desc "extract-job SOURCE_RELEASE_PATH SOURCE_JOB_NAME [JOB_NAME]", "Extracts a job from another release and all its dependent packages and source"
+      def extract_job(source_release_path, source_job_name, target_job_name=nil)
         target_job_name ||= source_job_name
         require 'bosh/gen/generators/extract_job_generator'
         Bosh::Gen::Generators::ExtractJobGenerator.start([source_release_path, source_job_name, target_job_name])
       end
 
+      desc "extract-pkg SOURCE_RELEASE_PATH SOURCE_PACKAGE_NAME", "Extracts a package from another release and all its dependent packages and sources"
+      def extract_pkg(source_release_path, source_package_name)
+        require 'bosh/gen/generators/extract_package_generator'
+        Bosh::Gen::Generators::ExtractPackageGenerator.start([source_release_path, source_package_name])
+      end
+
       desc "manifest NAME PATH UUID", "Creates a deployment manifest based on the release located at PATH"
       method_option :force, :type => :boolean, :desc => "Force override existing target manifest file"
       method_option :addresses, :aliases => ['-a'], :type => :array, :desc => "List of IP addresses available for jobs"

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

@@ -12,6 +12,12 @@ module Bosh::Gen
       argument :ip_addresses
       argument :flags, :type => :hash
 
+      def create_root
+        self.destination_root = File.expand_path(name, destination_root)
+        empty_directory '.'
+        FileUtils.cd(destination_root) unless options[:pretend]
+      end
+
       def check_release_path_is_release
         unless File.exist?(release_path)
           raise Thor::Error.new("target path '#{release_path}' doesn't exist")
@@ -33,6 +39,10 @@ module Bosh::Gen
         create_file manifest_file_name, manifest.to_yaml, :force => flags[:force]
       end
 
+      def setup_bosh_deployment_target
+        run "bosh deployment #{manifest_file_name}"
+      end
+
       private
       def release_detector
         @release_detector ||= Bosh::Gen::Models::ReleaseDetection.new(release_path)
@@ -40,7 +50,7 @@ module Bosh::Gen
       
       # Whether +name+ contains .yml suffix or nor, returns a .yml filename for manifest to be generated
       def manifest_file_name
-        basename = name.gsub(/\.yml/, '') + ".yml"
+        basename = "manifest.yml"
       end
       
       def job_manifests

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

@@ -0,0 +1,65 @@
+require 'yaml'
+require 'thor/group'
+
+module Bosh::Gen
+  module Generators
+    class ExtractPackageGenerator < Thor::Group
+      include Thor::Actions
+
+      argument :source_release_path
+      argument :source_package_name
+      
+      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 using_source_release_for_templates
+        source_paths << File.join(source_release_path)
+      end
+
+      # Extract target package and all its dependencies
+      def detect_dependent_packages
+        spec = YAML.load_file(source_package_dir("spec"))
+        @packages = [target_package_name]
+        @packages << spec["packages"] if spec["packages"]
+      end
+      
+      def copy_dependent_packages
+        @packages.each {|package| directory "packages/#{package}"}
+      end
+
+      def copy_dependent_sources
+        @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
+          end
+        end
+      end
+      
+      def readme
+        if @blobs
+          say_status "readme", "Upload blobs with 'bosh upload blobs'"
+        end
+      end
+      
+      private
+      def target_package_name
+        source_package_name
+      end
+      
+      def package_dir(path="")
+        File.join("packages", source_package_name, path)
+      end
+      
+      def source_package_dir(path="")
+        File.join(source_release_path, "packages", source_package_name, path)
+      end
+      
+    end
+  end
+end

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

@@ -89,6 +89,7 @@ module Bosh::Gen
         blobs/*
         .blobs
         .dev_builds
+        .vagrant
         .idea
         .DS_Store
         .final_builds/jobs/**/*.tgz

data/lib/bosh/gen/models/deployment_manifest.rb

@@ -8,7 +8,7 @@ module Bosh::Gen::Models
       @manifest = {}
       @cloud_properties = cloud_properties
       @security_groups = ["default"]
-      @stemcell_version = "0.5.1"
+      @stemcell_version = "0.6.2"
       @stemcell = { "name" => "bosh-stemcell", "version" => @stemcell_version }
       @persistent_disk = cloud_properties.delete("persistent_disk").to_i
       @static_ips = cloud_properties.delete("static_ips") || []

data/lib/bosh/gen/models/release_detection.rb

@@ -18,7 +18,7 @@ module Bosh::Gen::Models
     end
 
     def latest_dev_release_version
-      @latest_dev_release["version"].to_i
+      @latest_dev_release["version"]
     end
     
     def latest_dev_release_job_names

data/lib/bosh/gen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -128,6 +128,7 @@ files:
 - lib/bosh/gen/cli.rb
 - lib/bosh/gen/generators/deployment_manifest_generator.rb
 - lib/bosh/gen/generators/extract_job_generator.rb
+- lib/bosh/gen/generators/extract_package_generator.rb
 - lib/bosh/gen/generators/job_generator.rb
 - lib/bosh/gen/generators/job_generator/templates/.gitkeep
 - lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%/monit.tt
@@ -208,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3864668292302149746
+      hash: 1843884671280331738
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,10 +218,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3864668292302149746
+      hash: 1843884671280331738
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ''