volley 0.1.2 → 0.1.6

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+## v0.1.5:
+* action#stop should delegate to plan#stop
+
+## v0.1.4:
+* 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
+* bug fixes, meta and published plan work
+
+## v0.1.3:
+* bug fixes, meta and published plan work
+
+## v0.1.2:
+* add code to generate changelog
+* attempting to publish a duplicate artifact shouldn't throw an error
+* properly support force=true argument
+* allow for stopping plan processing with plan#stop
+
+## v0.1.1:
+* add the ability to daemonize the process using Daemons gem.
+* add Volley::Log#reset to forget previous log configuration in parent, before forking
+

data/bin/volley

@@ -3,15 +3,14 @@
 require 'rubygems'
 require 'docopt'
 require 'volley'
-require 'awesome_print'
 require 'daemons'
 
 DOC = <<-DOC
 Usage: volley [options] <plan> <descriptor> [argument]...
 
 <plan>
-  The plan to run.
-  reserved plan names: [versions, latest, list]
+  The plan to run. This can be just the plan name or the project:plan.
+  (will check in the reserved volley project for plan first)
 
 <descriptor>
   A descriptor should conform to the following format:
@@ -31,7 +30,8 @@ Usage: volley [options] <plan> <descriptor> [argument]...
 Options:
   -h --help           show this help message and exit
      --version        show version and exit
-  -d --debug          show debug output, change log level to debug
+  -d --debug          change log level to debug
+  -q --quiet          change log level to warn (generally this means no output)
   -c --config FILE    load additional Volleyfile [default: ~/.Volleyfile]
   -p --primary FILE   load primary Volleyfile [default: ./Volleyfile]
   -F --force          force operations (redeploy version, republish artifact)
@@ -50,6 +50,7 @@ module Volley
       STDOUT.sync = true
       options     = Docopt(DOC, Volley::Version::STRING)
       debug       = options[:debug]
+      quiet       = options[:quiet]
       config      = options[:config]
       primary     = options[:primary]
       fork        = options[:fork]
@@ -63,9 +64,15 @@ module Volley
       Volley::Dsl::VolleyFile.load(config, :optional => true)
       Volley::Dsl::VolleyFile.load(primary, :primary => true) if File.file?(primary)
 
-      Volley::Log.add(level.to_sym, log)
-      Volley::Log.console_debug if debug
       Volley.config.debug = debug
+      Volley.config.quiet = quiet
+
+      Volley::Log.add(level.to_sym, log)
+      if debug
+        Volley::Log.console_debug
+      elsif quiet
+        Volley::Log.console_quiet
+      end
 
       kvs = argv.select { |e| e.match(/(\w+)\=(\w+)/) }
       pos = argv.reject { |e| e.match(/(\w+)\=(\w+)/) }
@@ -74,8 +81,9 @@ module Volley
       desc = pos.shift
 
       raise "must specify plan" unless plan
+      if plan =~ /\:/
 
-      if Volley::Dsl.project(:volley).plan?(plan)
+      elsif Volley::Dsl.project(:volley).plan?(plan)
         # the plan is reserved
         plan = "volley:#{plan}"
       else
@@ -116,14 +124,10 @@ module Volley
     rescue Interrupt
       Volley::Log.info "interrupted"
     rescue SystemExit
-      Volley::Log.info "exited"
+      Volley::Log.debug "exited"
     rescue => e
       Volley::Log.error "error: #{e.message} at #{e.backtrace.first}"
-      #if debug
-        Volley::Log.error e
-      #else
-      #  Volley::Log.debug e
-      #end
+      Volley::Log.debug e
     end
   end
 end

data/conf/common.volleyfile

@@ -8,6 +8,7 @@ project :volley do
       puts "created: #{dest}"
     end
   end
+
   plan :list, :remote => false do
     default do
       Volley::Dsl::Project.projects.each do |p, project|
@@ -18,15 +19,17 @@ project :volley do
       end
     end
   end
+
   plan :latest do
     default do
-      (project,branch,_) = args.descriptor.get
+      (project, branch, _) = args.descriptor.get
       raise "project and branch must be specified" unless project && branch
 
       pub = Volley::Dsl.publisher
       puts pub.latest(project, branch)
     end
   end
+
   plan :versions, :remote => false do
     argument :all, :convert => :boolean, :default => false
     argument :output, :default => "list", :convert => :to_sym, :choices => ["json", "xml", "list"]
@@ -37,7 +40,7 @@ project :volley do
       pub  = Volley::Dsl.publisher
       data = []
       if args.all
-        data = pub.all.keys.reject {|e| e =~ /latest$/}
+        data = pub.all.keys.reject { |e| e =~ /latest$/ }
         data.each { |k, v| puts "%2s %s" % [v, k] }
       else
         if project
@@ -65,10 +68,38 @@ project :volley do
       end
     end
   end
+
   plan :meta, :remote => false do
     default do
-      Volley.meta.projects.each do |k, v|
-        puts "#{k} => #{v}"
+      list = Volley.meta.projects
+      unless list && list.count > 0
+        Volley::Log.info "no projects found"
+        stop
+      end
+
+      project = args.descriptor.get.first
+      if project
+        project = args.descriptor.get.first
+        Volley::Log.warn "#{list[project.to_sym]}"
+      else
+        list.each do |k, v|
+          Volley::Log.warn "#{k} => #{v}"
+        end
+      end
+    end
+  end
+
+  plan :published, :remote => false do
+    default do
+      pub = Volley::Dsl.publisher
+
+      unless pub
+        Volley::Log.error "publisher must be configured"
+        stop
+      end
+
+      pub.list do |p, b, v, data|
+        Volley::Log.warn "#{p}@#{b}:#{v}"
       end
     end
   end

data/lib/volley/dsl/action.rb

@@ -21,7 +21,7 @@ module Volley
         self.instance_eval &@block if @block
       end
 
-      delegate :project, :args, :files, :file, :attributes, :log, :arguments, :argv, :branch, :version, :action, :volley,
+      delegate :project, :args, :files, :file, :attributes, :log, :arguments, :argv, :branch, :version, :action, :volley, :stop,
                :to => :plan
 
       def command(cmd)

data/lib/volley/dsl/file.rb

@@ -63,6 +63,8 @@ module Volley
             return f if File.file?(f)
           end
           nil
+        rescue ArgumentError # rescue errors with expand path
+          nil
         end
       end
     end

data/lib/volley/dsl/plan.rb

@@ -61,9 +61,10 @@ module Volley
 
         begin
           run_actions
+        rescue ExecutionStopped => e
+          Volley::Log.debug "stopping execution at #{e.backtrace.first}"
         rescue => e
           puts "plan#call error: #{e.message} at #{e.backtrace.first}"
-          ap self
           raise e
         end
         [branch, version].join(":")
@@ -94,6 +95,7 @@ module Volley
 
       def stop
         @stopped = true
+        raise ExecutionStopped, "stopped"
       end
 
       def stopped?

data/lib/volley/exceptions.rb

@@ -0,0 +1,4 @@
+
+module Volley
+  class ExecutionStopped < StandardError; end
+end

data/lib/volley/log.rb

@@ -32,6 +32,12 @@ module Volley
         @loggers["STDERR"] = Yell.new(STDERR, :level => [:error, :fatal], :format => Yell::NoFormat)
       end
 
+      def console_quiet
+        console_disable
+        @loggers["STDOUT"] = Yell.new(STDOUT, :level => [:warn], :format => Yell::NoFormat)
+        @loggers["STDERR"] = Yell.new(STDERR, :level => [:error, :fatal], :format => Yell::NoFormat)
+      end
+
       %w{debug info warn error fatal}.each do |method_name|
         class_eval(<<-METHOD_DEFN, __FILE__, __LINE__)
           def #{method_name}(msg=nil, &block)

data/lib/volley/publisher/amazons3.rb

@@ -33,17 +33,31 @@ module Volley
         br = branch.to_s
         r = files[:desc][pr][br].keys || [] rescue []
         Volley::Log.info "could not find #{pr}@#{br}" unless r.count > 0
-        r
+        r.reject { |e| e == "latest" || e == "" }
       rescue => e
         Volley::Log.warn "error getting version list from publisher: #{e.message}"
         []
       end
 
+      def version_data(project, branch, version)
+        pr    = project.to_s
+        br    = branch.to_s
+        vr    = version.to_s
+        list  = files[:desc][pr][br][vr]
+        files = contents(project, branch, version)
+        time  = list.map { |e| e.last_modified }.sort.uniq.last
+        {
+            :contents  => files,
+            :timestamp => time,
+            :latest => (latest_version(project, branch) == vr)
+        }
+      end
+
       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 []
+        r = files[:desc][pr][br][vr].map { |e| e.key.gsub("#{pr}/#{br}/#{vr}/", "") } || [] rescue []
         Volley::Log.info "could not find #{pr}@#{br}:#{vr}" unless r.count > 0
         r
       rescue => e
@@ -123,21 +137,22 @@ module Volley
       end
 
       def files
-        hash = { :desc => { }, :all => { }, :latest => { } }
-        @connection.directories.get(@bucket).files.collect { |e| e.key }.each do |e|
-          (pr, br, vr)            = e.split(/\//)
-          hash[:desc][pr]         ||= { }
-          hash[:desc][pr][br]     ||= { }
-          hash[:desc][pr][br][vr] ||= []
-          hash[:desc][pr][br][vr] << e
-          hash[:all]    ||= { }
-          hash[:latest] ||= { }
-          v             = "#{pr}/#{br}/#{vr}"
-          #hash[:latest]["#{pr}/#{br}"] ||= latest(pr, br)
-          hash[:all][v] = hash["latest"] == v
+        @files ||= begin
+          hash = { :desc => { }, :all => { }, :latest => { } }
+          @connection.directories.get(@bucket).files.each do |e|
+            (pr, br, vr)            = e.key.split(/\//)
+            hash[:desc][pr]         ||= { }
+            hash[:desc][pr][br]     ||= { }
+            hash[:desc][pr][br][vr] ||= []
+            hash[:desc][pr][br][vr] << e
+            hash[:all]    ||= { }
+            hash[:latest] ||= { }
+            v             = "#{pr}/#{br}/#{vr}"
+            #hash[:latest]["#{pr}/#{br}"] ||= latest(pr, br)
+            hash[:all][v] = hash["latest"] == v
+          end
+          hash
         end
-        #ap hash
-        hash
       end
     end
   end

data/lib/volley/publisher/base.rb

@@ -12,12 +12,40 @@ module Volley
         @encrypted = optional(:encrypted, false)
         @local     = optional(:local, Volley.config.directory)
         @loglevel  = @debug ? :info : :debug
-        @latest    = {}
+        @latest    = { }
         @force     = false
 
         load_configuration
       end
 
+      def list(&block)
+        hash     = { }
+        unsorted = { }
+        plist    = projects
+        plist.each do |p|
+          hash[p] = { }
+          blist   = branches(p)
+          blist.each do |b|
+            hash[p][b] = { }
+            vlist      = versions(p, b)
+            vlist.each do |v|
+              d = version_data(p, b, v)
+              hash[p][b][v] = d
+              unsorted["#{p}@#{b}:#{v}"] = d if d[:contents] && d[:contents].count > 0
+            end
+          end
+        end
+
+        sorted = unsorted.sort_by { |k, v| v[:timestamp] }.reverse
+        sorted.each do |k, v|
+          d = Volley::Descriptor.new(k)
+          next unless d
+          yield d.project, d.branch, d.version, v
+        end
+
+        hash
+      end
+
       def projects
         raise "not implemented"
       end
@@ -43,7 +71,7 @@ module Volley
       end
 
       def latest(project, branch)
-        @latest["#{project}/#{branch}"] ||= pull_file(dir(project,branch), "latest")
+        @latest["#{project}/#{branch}"] ||= pull_file(dir(project, branch), "latest")
       end
 
       def latest_version(project, branch)
@@ -51,10 +79,10 @@ module Volley
       end
 
       def volleyfile(project, branch, version="latest")
-        d = dir(project,branch,version)
+        d        = dir(project, branch, version)
         contents = pull_file(d, "Volleyfile")
 
-        dest     = "#@local/Volleyfile-#{Time.now.to_i}-#{$$}"
+        dest = "#@local/Volleyfile-#{Time.now.to_i}-#{$$}"
         raise "File #{dest} already exists" if File.exists?(dest)
 
         log "saving Volleyfile: #{dest}"
@@ -84,7 +112,7 @@ module Volley
       end
 
       def pull(project, branch, version="latest")
-        dir = dir(project, branch, version)
+        dir  = dir(project, branch, version)
         file = remote_file(branch, version)
 
         log "vv #{me}#pull"
@@ -122,7 +150,6 @@ module Volley
       end
 
 
-
       def push_file(dir, name, contents)
         raise "not implemented"
       end

data/lib/volley/publisher/local.rb

@@ -18,7 +18,7 @@ module Volley
       def versions(pr, br)
         Dir["#@directory/#{pr}/#{br}/*"].map do |e|
           e.gsub(/#@directory\/#{pr}\/#{br}\//,"")
-        end
+        end.reject {|e| e == "latest" || e == ""}
       end
 
       def exists?(project, branch, version)
@@ -33,6 +33,20 @@ module Volley
         end
       end
 
+      def version_data(project, branch, version)
+        pr    = project.to_s
+        br    = branch.to_s
+        vr    = version.to_s
+        list  = Dir["#@directory/#{project}/#{branch}/#{version}/*"]
+        files = contents(project, branch, version)
+        time  = list.map { |e| File.mtime(e) }.sort.uniq.last
+        {
+            :contents  => files,
+            :timestamp => time,
+            :latest => (latest_version(project, branch) == vr)
+        }
+      end
+
       def delete_project(project)
         FileUtils.rm_rf("#@directory/#{project}")
         true

data/lib/volley/version.rb

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

data/lib/volley.rb

@@ -1,8 +1,8 @@
-#require "awesome_print"
 require "ostruct"
 require "active_support/all"
 
 require "volley/version"
+require "volley/exceptions"
 require "volley/log"
 require "volley/publisher/base"
 require "volley/publisher/exceptions"

data/spec/publisher_spec.rb

@@ -45,7 +45,7 @@ shared_examples_for Volley::Publisher::Base do
   end
 
   it "should be able to tell me the list of versions" do
-    expect(@pub.versions("spec", "trunk")).to match_array(%w{1 2 latest})
+    expect(@pub.versions("spec", "trunk")).to match_array(%w{1 2})
   end
 
   it "should be able to tell me the list of files" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volley
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -133,6 +133,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -157,6 +158,7 @@ files:
 - lib/volley/dsl/push_action.rb
 - lib/volley/dsl/stage.rb
 - lib/volley/dsl/volley_action.rb
+- lib/volley/exceptions.rb
 - lib/volley/log.rb
 - lib/volley/meta.rb
 - lib/volley/publisher/amazons3.rb
@@ -203,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: PubSub Deployment tool