bosh-gen 0.3.2 → 0.3.4

data/ChangeLog.md

@@ -22,6 +22,14 @@ Fixed:
 * `job` - ctl file has TODO to remind about PID file
 * `job` - use the provided release path to detect jobs
 
+### v0.3.3
+
+* `manifest` - introspect the release project for release + job information
+
+### v0.3.4
+
+* `manifest` - Force us-east-1e to ensure all VMs and volumes are always in the same AZ
+
 ## v0.2
 
 Added:

data/lib/bosh/gen/cli.rb

@@ -60,15 +60,15 @@ module Bosh
         Bosh::Gen::Generators::JobTemplateGenerator.start([job_name, file_path])
       end
 
-      desc "manifest NAME PATH", "Creates a deployment manifest based on the release located at PATH"
+      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"
-      def manifest(name, release_path)
+      def manifest(name, release_path, uuid)
         release_path = File.expand_path(release_path)
         ip_addresses = options["addresses"] || []
         flags = { :force => options["force"] || false }
         require 'bosh/gen/generators/deployment_manifest_generator'
-        Bosh::Gen::Generators::DeploymentManifestGenerator.start([name, release_path, ip_addresses, flags])
+        Bosh::Gen::Generators::DeploymentManifestGenerator.start([name, release_path, uuid, ip_addresses, flags])
       end
 
       no_tasks do

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

@@ -8,6 +8,7 @@ module Bosh::Gen
 
       argument :name
       argument :release_path
+      argument :director_uuid
       argument :ip_addresses
       argument :flags, :type => :hash
 
@@ -24,17 +25,17 @@ module Bosh::Gen
 
       # Create a deployment manifest (initially for AWS only)
       def create_deployment_manifest
-        cloud_properties = { "instance_type" => "m1.small" }
-        manifest = Bosh::Gen::Models::DeploymentManifest.new(name, "DIRECTOR_UUID", cloud_properties)
+        cloud_properties = { "instance_type" => "m1.small", "availability_zone" => "us-east-1e" }
+        manifest = Bosh::Gen::Models::DeploymentManifest.new(name, director_uuid, release_properties, cloud_properties)
         manifest.jobs = job_manifests(ip_addresses)
         create_file manifest_file_name, manifest.to_yaml, :force => flags[:force]
       end
 
       private
-      def jobs_dir(path = "")
-        File.join(release_path, "jobs", path)
+      def release_detector
+        @release_detector ||= Bosh::Gen::Models::ReleaseDetection.new(release_path)
       end
-
+      
       # 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"
@@ -50,11 +51,15 @@ module Bosh::Gen
         jobs
       end
       
-      # Return list of job names in this release based on the contents of jobs/* folder
+      # Return list of job names
       def detect_jobs
-        Dir[File.join(release_path, "jobs/*")].map {|job_path| File.basename(job_path) }
+        release_detector.latest_dev_release_job_names
+      end
+      
+      # The "release" aspect of the manifest, which has two keys: name, version
+      def release_properties
+        release_detector.latest_dev_release_properties
       end
-
     end
   end
 end

data/lib/bosh/gen/models.rb

@@ -4,4 +4,5 @@ module Bosh
     end
   end
 end
-require "bosh/gen/models/deployment_manifest"
+require "bosh/gen/models/deployment_manifest"
+require "bosh/gen/models/release_detection"

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

@@ -4,7 +4,7 @@ module Bosh::Gen::Models
   class DeploymentManifest
     attr_reader :manifest
     
-    def initialize(name, director_uuid, cloud_properties)
+    def initialize(name, director_uuid, release_properties, cloud_properties)
       @manifest = {}
       @cloud_properties = cloud_properties
       @security_groups = ["default"]
@@ -12,7 +12,7 @@ module Bosh::Gen::Models
       @stemcell = { "name" => "bosh-stemcell", "version" => @stemcell_version }
       manifest["name"] = name
       manifest["director_uuid"] = director_uuid
-      manifest["release"] = { "name" => name, "version" => 1}
+      manifest["release"] = release_properties.dup
       manifest["compilation"] = {
         "workers" => 10,
         "network" => "default",
@@ -50,6 +50,14 @@ module Bosh::Gen::Models
       manifest["properties"] = {}
     end
     
+    # Each item of +jobs+ is a hash. 
+    # The minimum hash is:
+    # { "name" => "jobname" }
+    # This is the equivalent to:
+    # { "name" => "jobname", "template" => "jobname", "instances" => 1}
+    #
+    # A +jobs+ item can also include a +"static_ips" item, which is an array of strings:
+    # { "name" => "jobname", "static_ips" => ['1.2.3.4', '9.8.7.6']}
     def jobs=(jobs)
       total_instances = 0
       manifest["jobs"] = []

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

@@ -0,0 +1,35 @@
+require "yaml"
+
+module Bosh::Gen::Models
+  class ReleaseDetection
+    attr_reader :release_path
+    attr_reader :latest_dev_release
+    
+    def initialize(release_path)
+      @release_path = release_path
+
+      @dev_config = YAML.load_file(File.join(release_path, "config", "dev.yml"))
+      @latest_dev_release_filename = File.expand_path(@dev_config["latest_release_filename"], release_path) # absolute or relative
+      @latest_dev_release = YAML.load_file(@latest_dev_release_filename)
+    end
+    
+    def latest_dev_release_name
+      @latest_dev_release["name"]
+    end
+
+    def latest_dev_release_version
+      @latest_dev_release["version"].to_i
+    end
+    
+    def latest_dev_release_job_names
+      @latest_dev_release["jobs"].map {|job| job["name"]}
+    end
+    
+    def latest_dev_release_properties
+      {
+        "name" => latest_dev_release_name,
+        "version" => latest_dev_release_version
+      }
+    end
+  end
+end

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.3.2"
+    VERSION = "0.3.4"
   end
 end

data/spec/fixtures/deployment_manifests/defaults.yml

@@ -2,8 +2,8 @@
 name: myproj
 director_uuid: UUID
 release:
-  name: myproj
-  version: 1
+  name: myrelease
+  version: 2
 compilation:
   workers: 10
   network: default

data/spec/fixtures/releases/some_dev_releases/config/dev.yml

@@ -0,0 +1,3 @@
+--- 
+dev_name: myrelease
+latest_release_filename: dev_releases/myrelease-10.yml

data/spec/fixtures/releases/some_dev_releases/dev_releases/index.yml

@@ -0,0 +1,6 @@
+--- 
+builds: 
+  5c4ded1540f4cc047244f3a5a2e11a99220a2a53: 
+    version: 1
+  d4e368b6c1734ac34555a349ca567aa226cc1a6e: 
+    version: 2

data/spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-1.yml

@@ -0,0 +1,11 @@
+--- 
+packages: 
+- name: redis
+  version: 0.1-dev
+  sha1: 3e4d5b321ae69bee3cc0753d1a91606612d710a4
+  dependencies: []
+
+jobs: []
+
+name: myrelease
+version: 1

data/spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-10.yml

@@ -0,0 +1,13 @@
+--- 
+packages: 
+- name: redis
+  version: 0.2-dev
+  sha1: 90a1131ebec948be6e4d2d2f25be7fa83b76ea79
+  dependencies: []
+
+jobs: 
+- name: redis
+  version: 0.1-dev
+  sha1: f9b23d1e4585357dc47636d75a63283f629bb1ee
+name: myrelease
+version: 10

data/spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-2.yml

@@ -0,0 +1,13 @@
+--- 
+packages: 
+- name: redis
+  version: 0.2-dev
+  sha1: 90a1131ebec948be6e4d2d2f25be7fa83b76ea79
+  dependencies: []
+
+jobs: 
+- name: redis
+  version: 0.1-dev
+  sha1: f9b23d1e4585357dc47636d75a63283f629bb1ee
+name: myrelease
+version: 2

data/spec/models/deployment_manifest_spec.rb

@@ -4,7 +4,9 @@ require "bosh/gen/models"
 
 class DeploymentManifestSpec < MiniTest::Spec
   it "creates 'defaults' manifest document with 2 jobs" do
-    manifest = Bosh::Gen::Models::DeploymentManifest.new("myproj", "UUID", {"instance_type" => "m1.small"})
+    manifest = Bosh::Gen::Models::DeploymentManifest.new("myproj", "UUID", 
+      {"name" => "myrelease", "version" => 2},
+      {"instance_type" => "m1.small"})
     manifest.jobs = [
       { "name" => "job-with-ips",  "static_ips" => ['1.2.3.4']},
       { "name" => "misc"}

data/spec/models/release_detection_spec.rb

@@ -0,0 +1,28 @@
+require "minitest/spec"
+require "minitest-colorize"
+require "bosh/gen/models"
+
+class ReleaseDetectionSpec < MiniTest::Spec
+  it "detects latest dev release version" do
+    detector = Bosh::Gen::Models::ReleaseDetection.new(fixture_release_path('some_dev_releases'))
+    latest_dev_release_version = detector.latest_dev_release_version
+    latest_dev_release_version.must_equal 10
+  end
+  
+  it "creates release properties for deployment manifest" do
+    detector = Bosh::Gen::Models::ReleaseDetection.new(fixture_release_path('some_dev_releases'))
+    detector.latest_dev_release_properties.must_equal({
+      "name" => "myrelease",
+      "version" => 10
+    })
+  end
+  
+  it "returns list of jobs" do
+    detector = Bosh::Gen::Models::ReleaseDetection.new(fixture_release_path('some_dev_releases'))
+    detector.latest_dev_release_job_names.must_equal %w[redis]
+  end
+  
+  def fixture_release_path(name)
+    File.expand_path("../../fixtures/releases/#{name}/", __FILE__)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -144,9 +144,16 @@ files:
 - lib/bosh/gen/generators/package_source_generator.rb
 - lib/bosh/gen/models.rb
 - lib/bosh/gen/models/deployment_manifest.rb
+- lib/bosh/gen/models/release_detection.rb
 - lib/bosh/gen/version.rb
 - spec/fixtures/deployment_manifests/defaults.yml
+- spec/fixtures/releases/some_dev_releases/config/dev.yml
+- spec/fixtures/releases/some_dev_releases/dev_releases/index.yml
+- spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-1.yml
+- spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-10.yml
+- spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-2.yml
 - spec/models/deployment_manifest_spec.rb
+- spec/models/release_detection_spec.rb
 homepage: https://github.com/drnic/bosh-gen
 licenses: []
 post_install_message: 
@@ -161,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1671350536901681396
+      hash: 983046583635840744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -170,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1671350536901681396
+      hash: 983046583635840744
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -179,4 +186,10 @@ specification_version: 3
 summary: ''
 test_files:
 - spec/fixtures/deployment_manifests/defaults.yml
+- spec/fixtures/releases/some_dev_releases/config/dev.yml
+- spec/fixtures/releases/some_dev_releases/dev_releases/index.yml
+- spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-1.yml
+- spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-10.yml
+- spec/fixtures/releases/some_dev_releases/dev_releases/myrelease-2.yml
 - spec/models/deployment_manifest_spec.rb
+- spec/models/release_detection_spec.rb