standup 0.6.8 → 0.6.9

data/lib/standup.rb

@@ -29,11 +29,15 @@ module Standup
   def self.local_scripts_path
     File.expand_path('config/standup') rescue nil
   end
+
+  def self.conf_scripts_path
+    File.expand_path("#{Settings.conf_scripts_path}/config/standup") rescue nil
+  end
   
   def self.scripts
     unless class_variable_defined? :@@scripts
       @@scripts = {}
-      [gem_scripts_path, local_scripts_path].each do |dir|
+      [gem_scripts_path, conf_scripts_path, local_scripts_path].compact.each do |dir|
         Dir.foreach dir do |name|
           next unless File.file? "#{dir}/#{name}"
           next unless name =~ /\.rb$/

data/lib/standup/scripts/base.rb

@@ -7,50 +7,50 @@ module Standup
         merge_params self.class.default_params
         merge_params Settings[name]
       end
-    
+
       class_attribute :name
-      
+
       class_attribute :default_params
       self.default_params = {}
-      
+
       class_attribute :description
-      
+
       attr_accessor :params
-      
+
       def name
         self.class.name
       end
-      
+
       def put_title
         bright_p name, HighLine::CYAN
       end
-      
+
       def script_file filename
-        [Standup.local_scripts_path, Standup.gem_scripts_path].each do |dir|
+        [Standup.local_scripts_path, Standup.conf_scripts_path, Standup.gem_scripts_path].compact.each do |dir|
           next unless dir
           path = File.expand_path("#{name}/#{filename}", dir)
           return path if File.exists? path
         end
         nil
       end
-      
+
       def with_processed_file filename
         Dir.mktmpdir do |dir|
           erb = ERB.new File.read(filename)
           erb.filename = filename
           result = erb.result get_binding
-          tmp_filename = File.expand_path File.basename(filename), dir 
+          tmp_filename = File.expand_path File.basename(filename), dir
           File.open(tmp_filename, 'w') {|f| f.write result}
           yield tmp_filename
         end
       end
-      
+
       def self.execute
         new.run
       end
-      
+
       protected
-      
+
       def merge_params param_overrides
         @params = if param_overrides.is_a? Hash
           ActiveSupport::HashWithIndifferentAccess.new((@params || {}).merge(param_overrides))
@@ -58,7 +58,7 @@ module Standup
           param_overrides || @params
         end
       end
-      
+
       def argument arg_pattern, arg_name = arg_pattern, variants = nil
         self.class.argument arg_pattern, arg_name, variants
       end
@@ -89,14 +89,14 @@ module Standup
           opt_parser.parse ARGV
           raise Trollop::HelpNeeded if ARGV.empty?
         end
-        
+
         result = ARGV.shift
         if variants && !variants.include?(result)
           opt_parser.die "unknown #{arg_name} #{result}", nil
         end
         result
       end
-      
+
       def get_binding
         binding
       end

data/lib/standup/version.rb

@@ -1,5 +1,5 @@
 module Standup
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standup
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop