bin_script 0.1.1 → 0.1.2

data/.gitignore

@@ -1,2 +1,3 @@
 log
-locks
+locks
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bin_script (0.1)
+    bin_script (0.1.2)
       activesupport (>= 2.3.2)
 
 GEM

data/README.markdown

@@ -50,7 +50,7 @@ class StuffScript < BinScript
     if test?
       logger.info "update string #{params(:u)}"        
     else  
-      logger.info "data #{Time.parse(params(:d))}"
+      logger.info "data #{params(:d)}"
     end
   end
 end

data/bin/bin_helper

@@ -1,15 +1,5 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
-# This helper is useful for requiring from bin scripts.
-# Detect RAILS_ENV from '-e' parameter in ARGV (or 'development' as default) and load rails environment if need.
-#
-# Sample ./bin/script_name.rb
-# #!/usr/bin/env ruby
-#
-# #NO_RAILS = true # Uncomment this line if you don't need rails environment in your script
-# require File.join(File.dirname(__FILE__),'_bin_helper')
-#
-# Helper will detect class name for this script automatically. So for example above helper call something like this: ScriptName.new.run!
 
 APP_ROOT ||= File.expand_path(File.dirname($0)) + "/../"
 
@@ -57,21 +47,21 @@ ARGV.each_index do |i|
   end
 end
 
-# Если задан ключ -h, то нам нужно только показать хэлп и environment грузить не обязательно
+# -h for show help, Rails not needed
 NO_RAILS = true if ARGV.include?('-h') && !defined?(NO_RAILS)
 
 # Set defaults
 ENV['RAILS_ENV'] ||= 'development'
 
-if !defined?(RAILS_ROOT) && !defined?(NO_RAILS)
+if !defined?(Rails) && !defined?(NO_RAILS)
   # Load rails envoronment if not yet and we need it
   require File.join(APP_ROOT, %w{config environment})
 else
   require 'active_support'
 end
 
-# Load BinScript class source
-require 'bin_script' unless defined?(BinScript) == 'constant'
+# Load BinScript class source (from gem)
+require 'bin_script' if !defined?(BinScript) || !BinScript.respond_to?(:run_script)
 
 # Call script runner
 BinScript.run_script

data/lib/bin_script/bin_script.rb

@@ -20,7 +20,7 @@ class BinScript
   ]
 
   # Default log level INFO or DEBUG for test env
-  @log_level = (Rails.env.development? ? XLogger::DEBUG : XLogger::INFO)
+  @log_level = (Rails.env == 'development' ? XLogger::DEBUG : XLogger::INFO)
 
   # Enable locking by default
   @enable_locking = true
@@ -168,7 +168,9 @@ class BinScript
 
     # RAILS_ROOT is not availible if rails environment was not loaded. So detect application root in this case from current file path
     def rails_root
-      Pathname.new(Rails.root ? Rails.root : File.join(File.dirname(__FILE__), %w{.. ..})).realpath.to_s
+      path = Rails.root
+      path ||= defined?(APP_ROOT) ? APP_ROOT : '.'
+      Pathname.new(path).realpath.to_s
     end
 
     # Prepare ARGV parameters as hash
@@ -213,7 +215,7 @@ class BinScript
   end
 
   def puts(*arg)
-    return if self.class.disable_puts_for_tests && Rails.env.test?
+    return if self.class.disable_puts_for_tests && Rails.env == 'test'
     Kernel.puts(*arg)
   end
 
@@ -222,11 +224,11 @@ class BinScript
     begin
       @source_argv = ARGV.dup
       @overrided_parameters = {}
-      @params_values = (Rails.env.test? ? {} : self.class.get_argv_values)
+      @params_values = (Rails.env == 'test' ? {} : self.class.get_argv_values)
 
       # Create logger if logging enabled
       if self.class.enable_logging
-        @logger = XLogger.new(:file => log_filename, :dont_touch_rails_logger => (Rails.env.test?))
+        @logger = XLogger.new(:file => log_filename, :dont_touch_rails_logger => (Rails.env == 'test'))
         @logger.level = self.class.log_level
       end
 
@@ -275,7 +277,7 @@ class BinScript
       log_benchmarker_data
     rescue Exception => e
       # Print error info if it's not test env or exit
-      if !Rails.env.test? && e.class != SystemExit && e.class != Interrupt 
+      if Rails.env != 'test' && e.class != SystemExit && e.class != Interrupt 
         msg = self.class.prepare_exception_message(e)
         puts "\n" + msg
         fatal msg
@@ -324,7 +326,7 @@ class BinScript
     when :optional
       #return nil unless @overrided_parameters.has_key?(key) || @params_values.has_key?(key)
       return @overrided_parameters[key] || @params_values[key] || param[:default]
-      when :required
+    when :required
       value = @overrided_parameters[key] || @params_values[key] || param[:default]
       return value
     end

data/lib/bin_script/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 class BinScript
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,63 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bin_script
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Lifshits Dmitry
 - Makarchev Konstantin
 autorequire: init
 bindir: bin
 cert_chain: []
-
-date: 2012-04-07 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &72761780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *72761780
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &72761580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Easy writing and executing bins (espesually for crontab or god) in Rails project
+  prerelease: false
+  version_requirements: *72761580
+description: Easy writing and executing bins (espesually for crontab or god) in Rails
+  project
 email: kostya27@gmail.com
-executables: 
+executables:
 - bin_helper
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -79,39 +63,29 @@ files:
 - lib/generators/bin/templates/spec.rb
 - spec/bin_script_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kostya/bin_script
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: Easy writing and executing bins (espesually for crontab or god) in Rails project For my purposes much better than Rake, Thor and Rails Runner
+summary: Easy writing and executing bins (espesually for crontab or god) in Rails
+  project For my purposes much better than Rake, Thor and Rails Runner
 test_files: []
-