volley 0.1.13 → 0.1.14

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## v0.1.13:
+* exit with errors for unknown exceptions
+
+## v0.1.12:
+* awesome_print dependency, since I keep using it and leaving it in
+
+## v0.1.11:
+* remove debug message
+* fix depcrated config for Yell
+* merge problem
+* more docopt fixes
+* handle docopt exit for --version
+* update to use newest docopt version
+
+## v0.1.10:
+* fix bug with argument handling, related to docopt changes
+* documentation
+
 ## v0.1.9:
 * remove dependency on awesome_print and debug statements. fail me.
 * more docopt fixes
@@ -34,55 +52,6 @@
 * bug fixes, meta and published plan work
 
 ## v0.1.2:
-* awesome_print dependency, since I keep using it and leaving it in
-* remove debug message
-* fix depcrated config for Yell
-* merge problem
-* fix bug with argument handling, related to docopt changes
-* documentation
-* remove dependency on awesome_print and debug statements. fail me.
-* more docopt fixes
-* handle docopt exit for --version
-* update to use newest docopt version
-* working on getting 'auto' source working
-* add better support for plan#stop
-* fix bugs in volley plans
-* remove dependencies and references to awesome_print
-* action#stop should delegate to plan#stop
-* fix problem with expand path throwing errors when HOME environment variable is not set
-* fix problem with volley:meta when the meta file doesn't exist
-* add -q --quiet option to CLI (bumps log level to warn)
-* add volley:published plan, show all published artifacts (used by jenkins for selecting version to deploy)
-* add version_data method to publisher, primarily to have access to modified time for sorting
-
-## v0.1.12:
-* awesome_print dependency, since I keep using it and leaving it in
-
-## v0.1.11:
-* remove debug message
-* fix depcrated config for Yell
-* merge problem
-* more docopt fixes
-* handle docopt exit for --version
-* update to use newest docopt version
-
-## v0.1.10:
-* fix bug with argument handling, related to docopt changes
-* documentation
-* remove dependency on awesome_print and debug statements. fail me.
-* more docopt fixes
-* handle docopt exit for --version
-* update to use newest docopt version
-* working on getting 'auto' source working
-* add better support for plan#stop
-* fix bugs in volley plans
-* remove dependencies and references to awesome_print
-* action#stop should delegate to plan#stop
-* fix problem with expand path throwing errors when HOME environment variable is not set
-* fix problem with volley:meta when the meta file doesn't exist
-* add -q --quiet option to CLI (bumps log level to warn)
-* add volley:published plan, show all published artifacts (used by jenkins for selecting version to deploy)
-* add version_data method to publisher, primarily to have access to modified time for sorting
 * add code to generate changelog
 * attempting to publish a duplicate artifact shouldn't throw an error
 * properly support force=true argument

data/Rakefile

@@ -49,7 +49,9 @@ def changelog(last=nil, single=false)
   puts "# Changelog"
   puts
 
-  list.lines.reject{|e| e =~ /\.alpha/}.reverse_each do |t|
+  ordered = list.lines.sort_by {|e| (a,b,c) = e.gsub(/^v/,"").split("."); "%3d%3d%3d" % [a, b, c]}
+
+  ordered.reject{|e| (a,b,c,d) = e.split("."); !d.nil?}.reverse_each do |t|
     tag = t.chomp
 
     if last

data/lib/volley/descriptor.rb

@@ -9,10 +9,16 @@ module Volley
       }.merge(options)
 
       if desc
+        @project = nil
+        @branch = nil
+        @version = nil
+
         list = desc.split(/[\@\:\.\/\\\-]/)
-        raise "error parsing descriptor: #{desc}" if (list.count < 2 || list.count > 3) && !@options[:partial]
-        (@project, @branch, @version) = list
+        raise "error parsing descriptor: #{desc}" if (list.count < 2 || list.count > 4) && !@options[:partial]
+
+        (@project, @branch, @version, @after) = list
         @version ||= "latest"
+        @version = "#@version-#@after" if @version != "latest" && @after
 
         raise "error parsing descriptor: #{desc}" unless (@project && @branch && @version) || @options[:partial]
       end

data/lib/volley/version.rb

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

data/spec/descriptor_spec.rb

@@ -7,6 +7,8 @@ describe Volley::Descriptor do
       %w{spec-trunk-1 spec trunk 1},
       %w{spec:trunk:1 spec trunk 1},
       %w{spec\trunk\1 spec trunk 1},
+      %w{spec@trunk:1-1 spec trunk 1-1},
+      %w{spec@trunk:1:1 spec trunk 1-1},
       %w{spec@trunk spec trunk latest},
       %w{spec/trunk spec trunk latest},
       %w{spec:trunk spec trunk latest},
@@ -28,7 +30,6 @@ describe Volley::Descriptor do
     spec
     spec:
     spec~trunk
-    spec:trunk:1:blarg
   }.each do |desc|
     it "should not handle format: '#{desc}'" do
       expect { Volley::Descriptor.new(desc) }.to raise_error(StandardError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -213,12 +213,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3417145727278252107
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3417145727278252107
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -245,4 +251,3 @@ test_files:
 - test/project/Rakefile
 - test/project/Volleyfile
 - test/trunk-1.tgz
-has_rdoc: