hobo_support 1.3.0.RC4 → 1.3.0.pre10

data/Rakefile

@@ -10,7 +10,7 @@ RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 namespace "test" do
   desc "Run the doctests"
   task :doctest do |t|
-    files=Dir['test/**/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
+    files=Dir['test/*.rdoctest','test/hobo_support/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
     exit(1) if !system("#{RUBYDOCTEST} --single #{files}")
   end
 end

data/VERSION

@@ -1 +1 @@
-1.3.0.RC4
+1.3.0.pre10

data/hobo_support.gemspec

@@ -1,6 +1,5 @@
 name = File.basename( __FILE__, '.gemspec' )
 version = File.read(File.expand_path('../VERSION', __FILE__)).strip
-require 'date'
 
 Gem::Specification.new do |s|
 
@@ -11,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary = 'Core Ruby extensions from the Hobo project'
   s.description = 'Core Ruby extensions from the Hobo project'
 
-  s.add_runtime_dependency('rails', ["~> 3.0.0"])
+  s.add_runtime_dependency('rails', [">= 3.0.0"])
   s.add_development_dependency('rubydoctest', [">= 0"])
 
   s.files = `git ls-files -x #{name}/* -z`.split("\0")

data/lib/generators/hobo_support/model.rb

@@ -1,9 +1,6 @@
-require 'generators/hobo_support/eval_template'
-
 module Generators
   module HoboSupport
     Model = classy_module do
-      include EvalTemplate
 
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
@@ -18,8 +15,10 @@ module Generators
       end
 
       def inject_hobo_code_into_model_file
+        source  = File.expand_path(find_in_source_paths('model_injection.rb.erb'))
+        context = instance_eval('binding')
         inject_into_class model_path, class_name do
-          eval_template('model_injection.rb.erb')
+          ERB.new(::File.binread(source), nil, '-').result(context)
         end
       end
 

data/lib/generators/hobo_support/thor_shell.rb

@@ -6,14 +6,14 @@ module Generators
 
       private
 
-      def ask(statement, default='', color=:magenta)
+      def ask(statement, default='', color=Thor::Shell::Color::MAGENTA)
         result = super(statement, color)
         result = default if result.blank?
         say PREFIX + result.inspect
         result
       end
 
-      def yes_no?(statement, color=:magenta)
+      def yes_no?(statement, color=Thor::Shell::Color::MAGENTA)
         result = choose(statement + ' [y|n]', /^(y|n)$/i)
         result == 'y' ? true : false
       end
@@ -26,8 +26,8 @@ module Generators
         when choice.blank? && !default.blank?
           default
         else
-          say 'Unknown choice! ', :red
-          choose(prompt, format, default)
+          say 'Unknown choice! ', Thor::Shell::Color::RED
+          choose(prompt, format)
         end
       end
 
@@ -35,6 +35,14 @@ module Generators
         say "\n #{title} \n", "\e[37;44m"
       end
 
+      def multi_ask(statement)
+        result = []
+        while (r = ask(statement)) && !r.blank?
+          result << r
+        end
+        result
+      end
+
     end
   end
 end

data/lib/hobo_support/command.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'tmpdir'
 
 module HoboSupport
   module Command
@@ -10,138 +9,84 @@ module HoboSupport
         is_hobo = gem == :hobo
         puts "#{gem.to_s.capitalize} Command Line Interface #{version}"
 
-        hobo_banner = %(
-Usage:
-    hobo new <app_name> [setup_opt] [rails_opt]  Creates a new Hobo Application
-        setup_opt:
-            --wizard|<none>  launch the setup_wizard in interactive mode
-            --setup          launch the setup_wizard in non-interactive mode
-                             expect you pass other setup_wizard options
-            --skip-setup     generate only the rails infrastructure and
-                             expect you launch the setup_wizard manually
-        rails_opt:           all the options accepted by the rails command
-)
+        banner = %(
+        Usage:
+            hobo new <app_name> [rails_options]   Creates a new Hobo Application
+            hobo g <generator> [ARGS] [options]   Fires the hobo:<generator>
+            hobo --help                           This help screen
 
-        hobofields_banner = %(
-Usage:
-    hobofields new <app_name> [rails_opt]          Creates a new HoboFields Application
-)
+        Dev Notes:
+            Set the HOBO_DEV_ROOT ENV variable to the Hobo root path in order
+            to use your local dev version instead of the installed gem.
 
-        banner = is_hobo ? hobo_banner : hobofields_banner
-        banner += %(
-    #{gem} generate|g <generator> [ARGS] [options] Fires the hobo:<generator>
-    #{gem} destroy <generator> [ARGS] [options]    Tries to undo generated code
-
-    #{gem} --help|-h                               This help screen
-
-Dev Notes:
-    Set the HOBODEV ENV variable to your local hobo git-repository path
-    in order to use your local dev version instead of the installed gem.
-
-)
-
-        # for hobo developers only
-        setup_wizard = true
-        default = false
+        )
 
         command = ARGV.shift
-
-        case command
-
-        when nil
+        if command.nil?
           puts "\nThe command is missing!\n"
           puts banner
           exit
+        end
+        # for hobo developers only
+        setup_wizard = true
 
-        when /^--help|-h$/
-          puts banner
-          exit
+        case command
 
         when 'new'
           app_name = ARGV.shift
+          if is_hobo && ARGV.first =~ /^--skip-wizard$/
+            setup_wizard = false
+            ARGV.shift
+          end
           if app_name.nil?
             puts "\nThe application name is missing!\n"
             puts banner
             exit
           end
-          if is_hobo
-            setup_wizard = case ARGV.first
-                           when /^--skip-wizard|--skip-setup$/
-                             ARGV.shift
-                             :skip
-                           when /^--setup|--default$/
-                             ARGV.shift
-                             :setup
-                           when /^--wizard$/
-                             ARGV.shift
-                             :wizard
-                           else
-                             :wizard
-                           end
-          end
-          template_path = File.join Dir.tmpdir, "hobo_app_template"
+          template_path = "/tmp/hobo_app_template"
           File.open(template_path, 'w') do |file|
-            if ENV["HOBODEV"]
-              dev_root = File.expand_path ENV["HOBODEV"], FileUtils.pwd
+            if ENV["HOBO_DEV_ROOT"]
+              dev_root = File.expand_path ENV["HOBO_DEV_ROOT"], FileUtils.pwd
               file.puts %(
-$:.unshift '#{dev_root}/hobo_support/lib'
-gem 'hobo_support', :path => '#{dev_root}/hobo_support'
-gem 'hobo_fields', :path => '#{dev_root}/hobo_fields'
-)
+        $:.unshift '#{dev_root}/hobo_support/lib'
+        gem 'hobo_support', :path => '#{dev_root}/hobo_support'
+        gem 'hobo_fields', :path => '#{dev_root}/hobo_fields'
+        )
               if is_hobo
                 file.puts %(
-gem 'dryml', :path => '#{dev_root}/dryml'
-gem 'hobo', :path => '#{dev_root}/hobo'
-)
+        gem 'dryml', :path => '#{dev_root}/dryml'
+        gem 'hobo', :path => '#{dev_root}/hobo'
+        )
               end
             else
-              file.puts %(
-gem '#{gem}', '= #{version}'
-)
+              file.puts "gem '#{gem}', '>= #{version}'"
             end
-            if is_hobo
+            if is_hobo && setup_wizard
               file.puts %(
-require 'generators/hobo_support/thor_shell'
-extend Generators::HoboSupport::ThorShell
-)
-              case setup_wizard
-              when :setup
-                file.puts %(
-say 'Running Setup...'
-exec 'rails g hobo:setup_wizard --skip-wizard #{ARGV * ' '} '
-)
-              when :wizard
-                file.puts %(
-say_title "Hobo Setup Wizard"
-if yes_no?("Do you want to start the Setup Wizard now?
-(Choose 'n' if you need to manually customize any file before running the Wizard.
-You can run it later with `hobo g setup_wizard` from the application root dir.)")
-  exec 'rails g hobo:setup_wizard --no-main-title'
-else
-  say "Please, remember to run `hobo g setup_wizard` from the application root dir, in order to complete the Setup.", :yellow
-end
-)
-              when :skip
-                file.puts %(
-say "Please, remember to run `hobo g setup_wizard` from the application root dir, in order to complete the Setup.", :yellow
-)
-              end
+        require 'generators/hobo_support/thor_shell'
+        extend Generators::HoboSupport::ThorShell
+
+        say_title "Hobo Setup Wizard"
+        if yes_no?("Do you want to start the Setup Wizard now?
+(Choose 'no' if you need to manually customize any file before running the Wizard.
+You can rerun it at any time with `hobo g setup_wizard` from the application root dir.)")
+          exec 'rails g hobo:setup_wizard --no-main-title'
+        else
+          say "Please, remember to run `hobo g setup_wizard` from the application root dir, in order to complete the Setup.", Thor::Shell::Color::YELLOW
+        end
+        )
             end
           end
           puts "Generating Rails infrastructure..."
           system "rails new #{app_name} #{ARGV * ' '} -m #{template_path}"
           File.delete template_path
 
-        when /^(g|generate|destroy)$/
-          cmd = $1
+        when /^(g|generate)$/
           if ARGV.empty?
             puts "\nThe generator name is missing!\n"
             puts banner
           else
-            if ARGV.first =~ /^hobo:(\w+)$/
-              puts "NOTICE: You can omit the 'hobo' namespace: e.g. `hobo #{cmd} #{$1} #{ARGV[1..-1] * ' '}`"
-            end
-            system "rails #{cmd} hobo:#{ARGV * ' '}"
+            exec "rails g hobo:#{ARGV * ' '}"
           end
 
         else

data/lib/hobo_support/common_tasks.rb

@@ -1,5 +1,4 @@
 require 'hobo_support/module'
-
 module HoboSupport
   CommonTasks = classy_module do
 

data/lib/hobo_support/fixes/chronic.rb

@@ -5,15 +5,15 @@ begin
   module Chronic
 
     class << self
-      def parse_with_hobo_fix(s, *options)
-        if s =~ /^\s*\d+\s*(st|nd|rd|th)\s+[a-zA-Z]+(\s+\d+)?\s*$/
+      def parse_with_hobo_fix(s)
+        if s =~ /^\s*\d+\s*(st|nd|rd|th)\s+[a-zA-Z]+(\s+\d+)?\s*$/ 
           s = s.sub(/\s*\d+(st|nd|rd|th)/) {|s| s[0..-3]}
         end
-
+        
         # Chronic can't parse '1/1/2008 1:00' or '1/1/2008 1:00 PM',
         # so convert them to '1/1/2008 @ 1:00' and '1/1/2008 @ 1:00 PM'
         s = s.sub(/^\s*(\d+\/\d+\/\d+)\s+(\d+:\d+.*)/, '\1 @ \2')
-        parse_without_hobo_fix(s, *options)
+        parse_without_hobo_fix(s)
       end
       alias_method_chain :parse, :hobo_fix
     end

data/lib/hobo_support/methodcall.rb

@@ -39,7 +39,7 @@ class NilClass
     SafeNil.instance
   end
 
-
+  
   def try(*args)
     if args.length==0
       # Hobo style try
@@ -49,7 +49,7 @@ class NilClass
       nil
     end
   end
-
+  
 end
 
 

data/lib/hobo_support/methodphitamine.rb

@@ -10,7 +10,7 @@ module Kernel
 end
 
 class It
-
+  
   instance_methods.reject { |m| m =~ /^__/ || m.to_s == 'object_id' }.each { |m| undef_method m }
 
   def initialize

data/lib/hobo_support/string.rb

@@ -22,7 +22,9 @@ class String
   def safe_constantize
     Object.class_eval self
   rescue NameError => e
-    if e.missing_name != self
+    # Unfortunately we have to rely on the error message to figure out which constant was missing.
+    # NameError has a #name method but it is always nil
+    if e.message !~ /\b#{self}$/
       # oops - some other name error
       raise
     else
@@ -31,4 +33,4 @@ class String
   end
 
 
-end
+end

data/lib/hobo_support.rb

@@ -21,7 +21,5 @@ require 'hobo_support/kernel'
 module HoboSupport
 
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
-  @@root = Pathname.new File.expand_path('../..', __FILE__)
-  def self.root; @@root; end
 
 end

data/test/hobosupport/module.rdoctest

@@ -21,7 +21,7 @@ When a module is included in a class, it gets a callback on the `included` metho
            alias_method_chain :name, :shouting
          end
        end
-     end
+     end 
 
      module M1
        def self.included(base)
@@ -76,7 +76,7 @@ In Ruby we use modules to factor out features that are shared by more than one c
      module M
        def self.included(base)
          base.send(:extend, ClassMethods)
-       end
+       end 
 
        module ClassMethods
          def foo; 123; end

data/test/hobosupport.rdoctest

@@ -7,17 +7,17 @@ HoboSupport is a mixed bag of core ruby extensions that have been extracted from
     doctest_require: '../lib/hobo_support'
 {.hidden}
 
+    >> HoboSupport::VERSION
+    => "1.3.0.pre6"
 
 ## Contents
 
- * [Chronic](/manual/hobo_support/chronic)
  * [Enumerable](/manual/hobo_support/enumerable)
  * [Hash](/manual/hobo_support/hash)
  * [Implies](/manual/hobo_support/implies)
  * [Metaid](/manual/hobo_support/metaid)
  * [Methodphitamine](/manual/hobo_support/methodphitamine)
  * [Module](/manual/hobo_support/module)
- * [XSS](/manual/hobo_support/xss)
 
 ## Object extensions
 
@@ -34,7 +34,7 @@ Like `is_a?` but multiple types to be checked in one go
 
 ## Method call extensions
 
-We have the "." operator to call methods on objects. These extensions introduce two "special dots".
+We have the "." operator to call methods on objects. These extensions introduce two "special dots". 
 
 ### `Object#_?`
 

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo_support
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.3.0.RC4
+  hash: -1637175975
+  prerelease: true
+  segments: 
+  - 1
+  - 3
+  - 0
+  - pre10
+  version: 1.3.0.pre10
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 -05:00
+date: 2010-10-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,8 +25,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +43,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -49,7 +63,6 @@ files:
 - Rakefile
 - VERSION
 - hobo_support.gemspec
-- lib/generators/hobo_support/eval_template.rb
 - lib/generators/hobo_support/model.rb
 - lib/generators/hobo_support/thor_shell.rb
 - lib/hobo_support.rb
@@ -71,7 +84,6 @@ files:
 - lib/hobo_support/string.rb
 - lib/hobo_support/xss.rb
 - test/hobosupport.rdoctest
-- test/hobosupport/chronic.rdoctest
 - test/hobosupport/enumerable.rdoctest
 - test/hobosupport/hash.rdoctest
 - test/hobosupport/implies.rdoctest
@@ -93,17 +105,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Core Ruby extensions from the Hobo project

data/lib/generators/hobo_support/eval_template.rb

@@ -1,14 +0,0 @@
-module Generators
-  module HoboSupport
-    EvalTemplate = classy_module do
-
-    private
-      def eval_template(template_name)
-        source  = File.expand_path(find_in_source_paths(template_name))
-        context = instance_eval('binding')
-        ERB.new(::File.binread(source), nil, '-').result(context)
-      end
-
-    end
-  end
-end

data/test/hobosupport/chronic.rdoctest

@@ -1,18 +0,0 @@
-# HoboSupport - Chronic extensions
-
-    doctest_require: '../../lib/hobo_support'
-{.hidden}
-
-## `Chronic.parse`
-
-Chronic.parse can't parse 'M/D/Y H:S', so convert it to 'M/D/Y @ H:S'.
-
-    >> Chronic.parse('1/1/2008 1:00') == Chronic.parse('1/1/2008 @ 1:00')
-
-    => true
-
-Chronic.parse takes additional options (see Chronic.parse).
-
-    >> Chronic.parse('today', :guess => false).instance_of? Chronic::Span
-
-    => true