volley 0.1.8 → 0.1.9

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.1.8:
+* more docopt fixes
+
 ## v0.1.7:
 * handle docopt exit for --version
 * update to use newest docopt version

data/bin/volley

@@ -4,7 +4,6 @@ require 'rubygems'
 require 'docopt'
 require 'volley'
 require 'daemons'
-require 'awesome_print'
 
 DOC = <<-DOC
 Usage:
@@ -53,7 +52,6 @@ module Volley
     def run(argv)
       STDOUT.sync = true
       options     = Docopt::docopt(DOC, :version => Volley::Version::STRING)
-      ap options
       debug       = options["--debug"]
       quiet       = options["--quiet"]
       config      = options["--config"]
@@ -64,7 +62,6 @@ module Volley
       force       = options["--force"]
       args        = { }
 
-
       Volley::Dsl::VolleyFile.init
       Volley::Dsl::VolleyFile.load(config, :optional => true)
       Volley::Dsl::VolleyFile.load(primary, :primary => true) if File.file?(primary)
@@ -79,8 +76,6 @@ module Volley
         Volley::Log.console_quiet
       end
 
-      ap argv
-
       kvs = argv.select { |e| e.match(/(\w+)\=(\w+)/) }
       pos = argv.reject { |e| e.match(/(\w+)\=(\w+)/) }
 

data/conf/common.volleyfile

@@ -1,5 +1,6 @@
 project :volley do
-  scm :base
+  scm :auto, :required => false
+
   plan :init, :remote => false do
     default do
       file = File.expand_path("../../init/Volleyfile", __FILE__)
@@ -9,6 +10,21 @@ project :volley do
     end
   end
 
+  plan :info, :remote => false do
+    default do
+      Volley::Log.info "SCM:"
+      Volley::Log.info ".. branch: #{source.branch} revision: #{source.revision}" if source
+      Volley::Log.info "Projects/Plans:"
+      Volley::Dsl::Project.projects.reject{|k, _| k==:volley}.each do |p, project|
+        h = project.plans
+        next unless h.count > 0
+        h.keys.each do |pl|
+          Volley::Log.info ".. #{p}:#{pl}"
+        end
+      end
+    end
+  end
+
   plan :list, :remote => false do
     default do
       Volley::Dsl::Project.projects.each do |p, project|

data/lib/volley/dsl/action.rb

@@ -4,6 +4,9 @@ module Volley
     class Action
       attr_reader :plan
 
+      delegate :project, :args, :files, :file, :attributes, :log, :arguments, :argv, :branch, :version, :action, :volley, :stop, :source,
+               :to => :plan
+
       def initialize(name, options={}, &block)
         @name = name.to_sym
         @stage = options.delete(:stage)
@@ -21,9 +24,6 @@ module Volley
         self.instance_eval &@block if @block
       end
 
-      delegate :project, :args, :files, :file, :attributes, :log, :arguments, :argv, :branch, :version, :action, :volley, :stop,
-               :to => :plan
-
       def command(cmd)
         plan.shellout(cmd)
       end

data/lib/volley/dsl/plan.rb

@@ -10,6 +10,9 @@ module Volley
       attr_reader :arguments
       attr_reader :attributes
 
+      delegate :source,
+          :to => :project
+
       def initialize(name, o={ }, &block)
         options     = {
             :name      => name,
@@ -111,10 +114,6 @@ module Volley
         @args = OpenStruct.new(@arguments.inject({ }) { |h, e| (k, v)=e; h[k] = v.value; h })
       end
 
-      def source
-        @project.source or raise "SCM not configured"
-      end
-
       def remote(tf)
         raise "remote can only be set to true or false" unless [true, false].include?(tf)
         @attributes.remote = tf

data/lib/volley/dsl/project.rb

@@ -36,7 +36,6 @@ module Volley
 
       attr_reader :plans
       attr_reader :name
-      attr_reader :source
 
       def initialize(name)
         @name = name
@@ -68,10 +67,33 @@ module Volley
       end
 
       def scm(name, o={}, &block)
+        options = {
+            :required => true,
+        }.merge(o)
         n = name.to_s
+
+        if n == "auto"
+          n = autoscm
+        end
+
+        if n.nil? || n.blank?
+          puts "N not set (project: #@name)"
+          if options[:required]
+            raise "could not automatically determine SCM"
+          else
+            return
+          end
+        end
+
         require "volley/scm/#{n}"
         klass = "Volley::Scm::#{n.camelize}".constantize
-        @source = klass.new(o)
+        @source = klass.new(options)
+      rescue => e
+        raise "unable to load SCM provider: #{n} #{e.message}"
+      end
+
+      def source
+        @source or raise "SCM not configured"
       end
 
       #def encrypt(tf, o={})
@@ -97,6 +119,14 @@ module Volley
       #  }.merge(o)
       #  config.pack = OpenStruct.new(options)
       #end
+
+      private
+
+      def autoscm
+        return "git" if File.directory?(File.expand_path("./.git"))
+        return "subversion" if File.directory?(File.expand_path("./.svn"))
+        nil
+      end
     end
   end
 end

data/lib/volley/scm/git.rb

@@ -10,14 +10,14 @@ module Volley
       end
 
       def branch
-        @branch ||= `git branch`.lines.select {|e| e =~ /^\*/}.first.chomp.split[1]
+        @branch ||= data[:branch]
       rescue => e
         Volley::Log.error "git: could not get branch: #{e.message}"
         Volley::Log.debug e
       end
 
       def revision
-        @revision ||= `git log --format='%h' --max-count=1`.chomp
+        @revision ||= data[:revision]
       end
 
       def update
@@ -26,6 +26,17 @@ module Volley
         @branch = nil
         @revision = nil
       end
+
+      private
+
+      def data
+        @data ||= begin
+          {
+              :branch => `git branch`.lines.select {|e| e =~ /^\*/}.first.chomp.split[1],
+              :revision => `git log --format='%h' --max-count=1`.chomp,
+          }
+        end
+      end
     end
   end
 end

data/lib/volley/scm/subversion.rb

@@ -9,13 +9,6 @@ module Volley
         }.merge(opt)
       end
 
-      def data
-        @data ||= begin
-          update if @options[:update]
-          YAML::load(%x{svn info})
-        end
-      end
-
       def branch
         @branch ||= begin
           if data["URL"] =~ /\/trunk/
@@ -40,6 +33,15 @@ module Volley
         up = %x{svn update}
         @data = nil
       end
+
+      private
+
+      def data
+        @data ||= begin
+          update if @options[:update]
+          YAML::load(%x{svn info})
+        end
+      end
     end
   end
 end

data/lib/volley/version.rb

@@ -3,7 +3,7 @@ unless defined?(Volley::Version)
     module Version
       MAJOR  = 0
       MINOR  = 1
-      TINY   = 8
+      TINY   = 9
       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.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors: