conan_deploy 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGY4ZWNhNGU2MmRmZGY1YmY0OWI0ZDNhZjBmZTBjYzMyMzQ0MTJmNA==
+  data.tar.gz: !binary |-
+    ZDBmNzgzNzc3YzYzZDc3YzY2ZjMzMjdkZDlkZjI1MDE4ZTM5NDEzNQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZjAwZWU1MjdkMjJiMjBhNjMxODZjNzU1OTFhZWEyYmI3N2RiYWI5ZjUzZmNm
+    ODc2YTViZGE4ZjA5ZjVjMGFlNzkwYjIwOTQzNDQ4NmUyMmVhYWEyNDMyZTE1
+    NGUzNGJkNTlkNTU0MTE3Y2ZhZmJkNTU4NTMyMWU2ZWIxNThkODI=
+  data.tar.gz: !binary |-
+    MDVmN2I4ZjViMTQ1MjIwODZlYjNiMWJkOTc0YjhiMDQzODQ0MWI0YWE2ZGNm
+    ZDJmNWQwZDliMjlhMmE4ZTdkMGJiOTc0MzI2NjNlYTJiNWUzNGM2MDQ4NGYy
+    ZGNhNjlhOTU5OGJhNTU2ZTBhM2Y1NDliZWI2NWIxNjM0ZDhhMGQ=

data/bin/conan

@@ -65,6 +65,14 @@ optparse = OptionParser.new do |o|
     options[:'deploy-shipcloud'] = shipcloud
   end
 
+  o.on("-n", '--deploy-app-name [APPNAME]', 'Only include deployments for the given application name') do |appname|
+    options[:'deploy-app-name'] = appname
+  end
+
+  o.on("-r", '--deploy-app-version [APPVERSION]', 'Only include deployments for the given application version') do |appversion|
+    options[:'deploy-app-version'] = appversion
+  end
+
   o.on('-D','--dry-run', 'Deployment dry-run. Prints Stackato commands' ) do
     options[:'dry-run'] = true
   end  

data/lib/conan/manifest_builder.rb

@@ -47,7 +47,7 @@ class Manifest
   end
 
   def pipeline(pipeline_id, &block)
-    pl = Pipeline.new(pipeline_id, @artifact_repo, @output)
+    pl = Pipeline.new(pipeline_id, @artifact_repo, @output, @options)
     pl.instance_eval(&block)
     @pipelines[pipeline_id] = pl
     pl
@@ -151,22 +151,28 @@ class Pipeline
 
   attr_accessor :id, :apps
 
-  def initialize(id, artifact_repo, output)
+  def initialize(id, artifact_repo, output, options)
     @id = id    
     @artifact_repo = artifact_repo    
     @output = output
-    @apps = {}    
+    @apps = {}
+    @options = options    
   end
 
   def app(app_id, project_name, platform_type)
-    @apps[app_id] = case platform_type
-      when :jvm
-        JvmApp.new(app_id, project_name, @artifact_repo)
-      when :rails_zip
-        RailsZipApp.new(app_id, project_name, @artifact_repo)
-      else
-        raise "unknown platform type: #{platform_type}"
-      end     
+    if (@options[:'deploy-app-name'].nil?) || (@options[:'deploy-app-name'] == app_id.to_s)
+      puts "No app specified, or we matched the specified app: #{@options[:'deploy-app-name']}"
+      @apps[app_id] = case platform_type
+        when :jvm
+          JvmApp.new(app_id, project_name, @artifact_repo)
+        when :rails_zip
+          RailsZipApp.new(app_id, project_name, @artifact_repo)
+        else
+          raise "unknown platform type: #{platform_type}"
+        end
+    else
+      puts "App #{app_id} doesn't match specified app #{@options[:'deploy-app-name']}, skipping"
+    end
   end
 
   def appVersion(app_id)
@@ -174,7 +180,7 @@ class Pipeline
   end  
 
   def load!(environment, deploy_shipcloud)
-    eachAppDeployment(environment) { |app, deploy| 
+    eachAppDeployment(environment) { |app, deploy|
       # load the persisted meta-data
       @output.loadAppMetadataFromDeploymentIfExists(app, deploy)
     }
@@ -184,8 +190,11 @@ class Pipeline
   def update(environment, from_upstream_env)
     @apps.values.each { |app| 
       puts ''
-      # promote versions from an upstream deploy
-      if (from_upstream_env)        
+      if !(@options[:'deploy-app-version'].nil?)
+        puts "Using version from options: #{@options[:'deploy-app-version']}"
+        app.findRequestedVersion(@options[:'deploy-app-version'])
+      elsif (from_upstream_env)        
+        # promote versions from an upstream deploy
         # TODO: this needs improving
         puts "Promote #{app.id} from #{from_upstream_env.id} to #{environment.id}"
         upstream_deploy = from_upstream_env.deployments.select { |d| d.app_ids.select {|x| x == app.id }.size > 0 }.first             
@@ -193,7 +202,7 @@ class Pipeline
       else
         puts "Find latest #{app.artifact_id}"
         # lookup most recent from repo
-        app.findLatestVersion()
+        app.findRequestedVersion('LATEST')
       end
       @output.clean(app, environment)
       # download artifacts
@@ -272,7 +281,8 @@ class Application
     @artifact_id = mvn_id[1] 
   end
 
-  def findLatestVersion    
+  def findRequestedVersion(requested_version='LATEST')   
+    puts("Finding requested version: #{requested_version}")
     extension = case platform_type
       when :jvm
         "jar"
@@ -281,8 +291,8 @@ class Application
       else
         raise "Unsupported platform type: #{platform_type}"
       end  
-    readArtifactMetadata(@artifact_repo.resolveArtifact(group_id, artifact_id, extension))
-    puts "- Found latest #{@id} artifact\n"+
+    readArtifactMetadata(@artifact_repo.resolveArtifact(group_id, artifact_id, extension, requested_version))
+    puts "- Found version #{version} #{@id} artifact\n"+
       "  Artifact: #{self}\n" +
       "  Checksum: #{@sha1}"    
   end

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Mike Reardon
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daphne_util
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -35,6 +32,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/conan
 - lib/conan/application_helper.rb
 - lib/conan/deploy.rb
@@ -46,29 +44,27 @@ files:
 - lib/conan/stackato.rb
 - lib/conan/templates.rb
 - lib/conan/version.rb
-- README.md
 homepage: http://github.com/MTNSatelliteComm/conan/README.md
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Conan da Deployer
 test_files: []