volley 0.1.1 → 0.1.2

data/Rakefile

@@ -39,4 +39,52 @@ task :test do
   rescue => e
     puts "#{e.message} at #{e.backtrace.first}"
   end
-end
+end
+
+def changelog(last=nil, single=false)
+  command="git --no-pager log --format='%an::::%h::::%s'"
+
+  list = `git tag`
+
+  puts "# Changelog"
+  puts
+
+  list.lines.reject{|e| e =~ /\.alpha/}.reverse_each do |t|
+    tag = t.chomp
+
+    if last
+      check = { }
+      out   = []
+      log   = `#{command} #{last}...#{tag}`
+      log.lines.each do |line|
+        (who, hash, msg) = line.split('::::')
+        unless check[msg]
+          unless msg =~ /^Merge branch/ || msg =~ /CHANGELOG/ || msg =~ /^(v|version|changes for|preparing|ready for release|ready to release|bump version)*\s*(v|version)*\d+\.\d+\.\d+/
+            msg.gsub(" *", "\n*").gsub(/^\*\*/, "  *").lines.each do |l|
+              line = l =~ /^(\s+)*\*/ ? l : "* #{l}"
+              out << line
+            end
+            check[msg] = hash
+          end
+        end
+      end
+      puts "## #{last}:"
+      out.each { |e| puts e }
+      #puts log
+      puts
+    end
+
+    last = tag
+    exit if single
+  end
+end
+
+desc "generate changelog output"
+task :changelog do
+  changelog
+end
+
+desc "show current changes (changelog output from HEAD to most recent tag)"
+task :current do
+  changelog("HEAD",true)
+end

data/features/publisher.feature

@@ -36,7 +36,7 @@ Feature: Publisher
   Scenario: Duplicate Artifact
     Given I have a populated repository
     When I publish a duplicate artifact test/staging/12
-    Then I should receive an exception
+    Then I should not receive an exception
 
 # TODO: make this work
 #  Scenario: Duplicate Artifact force

data/features/step_definitions/publisher_steps.rb

@@ -56,8 +56,9 @@ When /^I publish a duplicate artifact (.*)$/ do |desc|
     When I publish the artifact #{desc}
   }
   begin
-    publish(desc)
+    @duplicate_published = publish(desc)
   rescue => e
+    puts "exception: #{e.message}"
     @exception = e
   end
 end
@@ -66,7 +67,7 @@ end
 When /^I force publish a duplicate artifact (.*)$/ do |desc|
   steps %Q{
     When I publish the artifact #{desc}
-        }
+  }
   begin
     publish(desc)
   rescue => e

data/lib/volley/dsl/action.rb

@@ -16,6 +16,7 @@ module Volley
       end
 
       def call
+        return if @plan.stopped?
         Volley::Log.debug "## #{project.name}:#{@plan.name}[#{@stage}]##@name"
         self.instance_eval &@block if @block
       end

data/lib/volley/dsl/plan.rb

@@ -25,6 +25,7 @@ module Volley
 
         @name        = name.to_sym
         @project     = options[:project]
+        @stopped     = false
         @block       = block
         @files       = []
         @arguments   = { }
@@ -43,6 +44,7 @@ module Volley
         else
           argument :descriptor, :convert => :descriptor, :convert_opts => { :partial => true }
         end
+        argument :force
       end
 
       def call(options={ })
@@ -57,7 +59,13 @@ module Volley
 
         Volley::Log.info ">> #{@project.name}:#@name"
 
-        run_actions
+        begin
+          run_actions
+        rescue => e
+          puts "plan#call error: #{e.message} at #{e.backtrace.first}"
+          ap self
+          raise e
+        end
         [branch, version].join(":")
       end
 
@@ -77,12 +85,21 @@ module Volley
         out.join(" ")
       end
 
-      def run_actions(*stages)
+      def run_actions
         @stage_order.each do |stage|
+          @current_stage = stage
           @stages[stage].call
         end
       end
 
+      def stop
+        @stopped = true
+      end
+
+      def stopped?
+        @stopped
+      end
+
       def method_missing(n, *args)
         Volley::Log.warn "** plan DSL does not support method: #{n} #{args.join(',')}"
         raise "not supported"
@@ -173,7 +190,12 @@ module Volley
             :descriptor => args.descriptor,
             :args => {},
         }.merge(options)
-        @stages[:main].add Volley::Dsl::VolleyAction.new("volley-#{plan}", o)
+        action = Volley::Dsl::VolleyAction.new("volley-#{plan}", o)
+        #if @current_stage == :post
+        #  action.call
+        #else
+          @stages[:main].add action
+        #end
       end
 
       def file(file)
@@ -227,6 +249,9 @@ module Volley
         @arguments.each do |k, v|
           v.check
         end
+        if @arguments[:force] && Volley::Dsl.publisher
+          Volley::Dsl.publisher.force = true
+        end
       end
     end
   end

data/lib/volley/dsl/push_action.rb

@@ -12,6 +12,17 @@ module Volley
         raise "stage instance must be set" unless @stage
         raise "plan instance must be set" unless @plan
 
+        @plan.action :check, :pre do
+          raise "branch(#{branch}) and version(#{version}) must be specified" unless branch && version
+          p = @plan.project.name
+          b = branch
+          v = version
+          if Volley::Dsl.publisher.exists?(p, b, v)
+            log ".. artifact exists: #{p}@#{b}:#{v}"
+            @plan.stop unless args.force
+          end
+        end
+
         @plan.action :files, :main do
           raise "branch(#{branch}) and version(#{version}) must be specified" unless branch && version
 

data/lib/volley/publisher/amazons3.rb

@@ -18,7 +18,8 @@ module Volley
         []
       end
 
-      def branches(pr)
+      def branches(project)
+        pr = project.to_s
         r = files[:desc][pr].keys || [] rescue []
         Volley::Log.info "could not find #{pr}" unless r.count > 0
         r
@@ -27,7 +28,9 @@ module Volley
         []
       end
 
-      def versions(pr, br)
+      def versions(project, branch)
+        pr = project.to_s
+        br = branch.to_s
         r = files[:desc][pr][br].keys || [] rescue []
         Volley::Log.info "could not find #{pr}@#{br}" unless r.count > 0
         r
@@ -36,7 +39,10 @@ module Volley
         []
       end
 
-      def contents(pr, br, vr)
+      def contents(project, branch, version)
+        pr = project.to_s
+        br = branch.to_s
+        vr = version.to_s
         r = files[:desc][pr][br][vr].map {|e| e.gsub("#{pr}/#{br}/#{vr}/","")} || [] rescue []
         Volley::Log.info "could not find #{pr}@#{br}:#{vr}" unless r.count > 0
         r
@@ -46,7 +52,13 @@ module Volley
       end
 
       def exists?(project, branch, version)
-        !files[:desc][project][branch][version].nil? rescue false
+        pr = project.to_s
+        br = branch.to_s
+        vr = version.to_s
+        !files[:desc][pr][br][vr].nil?
+      rescue => e
+        Volley::Log.debug "exists? error: #{e.message}"
+        false
       end
 
       def delete_project(project)

data/lib/volley/publisher/base.rb

@@ -1,6 +1,8 @@
 module Volley
   module Publisher
     class Base
+      attr_accessor :force
+
       def initialize(options={ })
         @options = {
             :overwrite => false,
@@ -11,6 +13,7 @@ module Volley
         @local     = optional(:local, Volley.config.directory)
         @loglevel  = @debug ? :info : :debug
         @latest    = {}
+        @force     = false
 
         load_configuration
       end
@@ -60,7 +63,8 @@ module Volley
       end
 
       def push(project, branch, version, localfiles)
-        raise ArtifactExists, "the artifact already exists" if exists?(project, branch, version)
+        v = version == "latest" ? latest_version(project, branch) : version
+        return false if exists?(project, branch, v) && !@force
 
         localfiles = [*localfiles].flatten
         log "^^ #{me}#push"

data/lib/volley/version.rb

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

data/spec/dsl_plan_spec.rb

@@ -57,14 +57,14 @@ describe Volley::Dsl::Plan do
 
   it "should handle arguments" do
     @plan.argument(:testarg)
-    expect(@plan.arguments.count).to eq(2) # descriptor and testarg
+    expect(@plan.arguments.count).to eq(3) # descriptor and testarg
     @plan.call(:args => {:descriptor => "test@trunk/1",:testarg => "true"})
     expect(@plan.args.testarg).to eq("true")
   end
 
   it "should handle arguments (with remote false)" do
     @notremote.argument(:testarg)
-    expect(@notremote.arguments.count).to eq(2) # descriptor and testarg
+    expect(@notremote.arguments.count).to eq(3) # descriptor and testarg
     @notremote.call(:args => {:testarg => "true"})
     expect(@notremote.args.testarg).to eq("true")
   end

data/spec/publisher_spec.rb

@@ -63,8 +63,17 @@ shared_examples_for Volley::Publisher::Base do
     expect(@pub.latest("spec", "trunk")).to eq("spec/trunk/3")
   end
 
-  it "should throw an exeception when trying to publish a duplicate artifact" do
-    expect { @pub.push("spec", "trunk", "1", "./trunk-1.tgz") }.to raise_error(StandardError)
+  it "should fail to publish a duplicate artifact" do
+    expect(@pub.push("spec", "trunk", "1", "./trunk-1.tgz")).to eq(false)
+  end
+
+  it "should be able to force publish a duplicate artifact" do
+    Dir.chdir("#{root}/test/")
+    o = @pub.force
+    @pub.force = true
+    expect(@pub.push("spec", "trunk", "1", "./trunk-1.tgz")).to eq(true)
+    @pub.force = o
+    Dir.chdir(root)
   end
 
   it "should be able to delete a project" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp