volley 0.1.15 → 0.1.17

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.1.16:
+* only use source to determine version when publishing
+
+## v0.1.15:
+* missed in previous descriptor change. Tests now check valid? and parsing
+
 ## v0.1.14:
 * update descriptor to support project@branch:5005-1
 

data/lib/volley/dsl/plan.rb

@@ -130,9 +130,14 @@ module Volley
         if v.nil? || v == "latest"
           v = begin
             if deploying?
-              Volley::Dsl.publisher.latest_version(args.descriptor.project, args.descriptor.branch) || v
+              Volley::Dsl.publisher.latest_version(args.descriptor.project, args.descriptor.branch)
             elsif publishing?
-              source.revision || v
+              begin
+                source.revision
+              rescue Volley::ScmNotConfigured => e
+                Volley::Log.debug "failed to get version from source, trying publisher"
+                Volley::Dsl.publisher.latest_version(args.descriptor.project, args.descriptor.branch)
+              end
             end
           rescue => e
             Volley::Log.debug "failed to get version? #{v.inspect} : #{e.message}"

data/lib/volley/dsl/project.rb

@@ -92,7 +92,7 @@ module Volley
       end
 
       def source
-        @source or raise "SCM not configured"
+        @source or raise Volley::ScmNotConfigured, "SCM not configured"
       end
 
       #def encrypt(tf, o={})

data/lib/volley/dsl/volley_action.rb

@@ -23,13 +23,8 @@ module Volley
           plan = @run
           (runpr, plan) = plan.split(/\:/) if @run =~ /\:/
           (project, branch, version) = desc.get
-          Volley.process("#{runpr}:#{plan}", "#{runpr}@#{branch}:#{version}", :args => args)
+          Volley.process("#{runpr}:#{plan}", "#{project}@#{branch}:#{version}", args.marshal_dump)
         end
-
-        #@plan.action "volley-#@run" do
-        #  puts "volley run #@run #@desc"
-        #  Volley.process(@run, @desc.to_s, :args => args)
-        #end
       end
     end
   end

data/lib/volley/exceptions.rb

@@ -1,4 +1,6 @@
 
 module Volley
   class ExecutionStopped < StandardError; end
+  class ScmNotConfigured < StandardError; end
+  class VersionFailure < StandardError; end
 end

data/lib/volley/version.rb

@@ -3,7 +3,7 @@ unless defined?(Volley::Version)
     module Version
       MAJOR  = 0
       MINOR  = 1
-      TINY   = 15
+      TINY   = 17
       TAG    = nil
       STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1870677156941386299
+      hash: -2191872871642418347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1870677156941386299
+      hash: -2191872871642418347
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24