ride 0.1.2 → 0.2.1

data/Manifest.txt

@@ -10,9 +10,9 @@ app_generators/ride/templates/.vim/ftdetect/ruby.vim
 app_generators/ride/templates/.vim/ftplugin/ruby/ruby.vim
 app_generators/ride/templates/.vim/plugin/taglist.vim
 app_generators/ride/templates/.vim/syntax/eruby.vim
-app_generators/ride/templates/History.txt
-app_generators/ride/templates/License.txt
-app_generators/ride/templates/README.txt
+app_generators/ride/templates/RIDE_History.txt
+app_generators/ride/templates/RIDE_License.txt
+app_generators/ride/templates/RIDE_README.txt
 app_generators/ride/templates/config/.screenrc.code.erb
 app_generators/ride/templates/config/code_template.erb
 app_generators/ride/templates/script/console

data/app_generators/ride/ride_generator.rb

@@ -3,7 +3,7 @@ class RideGenerator < RubiGen::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
 
-  default_options :author => nil, :language => "ruby", :shell => 'bash', :editor => 'vim', :console_debugger => 'script/console'
+  default_options :author => nil, :language => "ruby", :shell => 'bash', :editor => 'vim', :console_debugger => 'script/ride-console'
 
   attr_reader :name, :main_lib, :shell, :editor, :template, :language, :screen_name, :console_debugger
 
@@ -33,13 +33,14 @@ class RideGenerator < RubiGen::Base
 
       m.dependency "install_rubigen_scripts", [destination_root, 'ride'],
         :shebang => options[:shebang], :collision => :force
-      m.file_copy_each %w{History.txt License.txt README.txt}
+      m.file_copy_each %w{RIDE_History.txt RIDE_License.txt RIDE_README.txt}
       m.file_copy_each [%w{ftplugin ruby ruby.vim}, %w{plugin taglist.vim}, %w{syntax eruby.vim}, %w{ftdetect ruby.vim}].map { |vimfile| File.join(".vim", *vimfile) }
       script_options     = { :chmod => 0755, :shebang => options[:shebang] == RideGenerator::DEFAULT_SHEBANG ? nil : options[:shebang] }
       m.file_copy_each %w{tasks/rspec.rake tasks/ride.rake}
       m.template  "config/.screenrc.code.erb", "config/.screenrc.code.erb"
       m.template "config/code_template.erb", "config/code_template.erb"
       m.template "script/ride", "script/ride", script_options
+      m.file "script/console", "script/ride-console", script_options
     end
   end
 
@@ -65,7 +66,7 @@ EOS
       opts.on("-e", "--editor", String, "Editor to use" "Default: vim") { |options[:editor]| }
       opts.on("-s", "--shell", String, "Shell to use" "Default: bash") { |options[:shell]| }
       opts.on("-n", "--name", String, "What to name the screen session" "Default: #{@name}") { |options[:screen_name]| }
-      opts.on("-d", "--debugger", String, "What to use for window 1, debugger", "Default: script/console") { |options[:console_debugger]| }
+      opts.on("-d", "--debugger", String, "What to use for window 1, debugger", "Default: script/ride-console") { |options[:console_debugger]| }
       opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
     end
 

data/app_generators/ride/templates/script/console

@@ -1,10 +1,28 @@
 #!/usr/bin/env ruby
 # File: script/console
+right_here = File.dirname(__FILE__)
+
+if File.exists?(console = File.join(right_here, "console")) and File.executable?(console)
+  # This is rails or a newgem app or someone who provided their own script/console, use it
+  exec "#{console}"
+elsif File.exists?(rakefile = File.join(right_here, "..", "Rakefile")) and File.read(rakefile).match(/Merb\.start/)
+  # looks like merb, start merb interactive
+  exec "merb -i"
+end
+
+# not merb, not rails, not an app with its own ./script/console, run irb
 irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/<%= main_lib %>.rb'}"
-puts "Loading ride gem"
-exec "#{irb} #{libs} --simple-prompt"
+# Hold an array of libraries (to be required by irb)
+libs =  []
+
+# Perhaps use a console_lib to store any extra methods we may want available in the console
+# libs << (File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb')
+
+# Add all libs to the irb session (so they can be required)
+Dir["lib/**/*"].map { |f| File.dirname(f) }.uniq.each { |dir| $: << dir }
+
+# Preload specific libs
+libs += %w{irb/completion}
+puts "Loading interactive session"
+exec "#{irb} -r #{libs.join(" -r ")}"

data/lib/ride/version.rb

@@ -1,8 +1,8 @@
 module Ride
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 2
+    MINOR = 2
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/ride_generator_spec.rb

@@ -31,7 +31,7 @@ describe "Ride Generator", "when application is generated" do
     end
   end
 
-  %w{History.txt License.txt README.txt}.each do |file|
+  %w{RIDE_History.txt RIDE_License.txt RIDE_README.txt}.each do |file|
     it "should create #{file}" do
       File.exists?(full_path(file)).should == true
     end
@@ -61,12 +61,18 @@ describe "Ride Generator", "when application is generated" do
     File.exists?(full_path(file_path)).should == true
   end
 
-  it "should create the script/ride file" do
+  it "should create the script/ride file (executable)" do
     file_path = File.join("script", "ride")
     File.exists?(full_path(file_path)).should == true
     FileTest.executable?(full_path(file_path)).should == true
   end
 
+  it "should create the script/ride-console file (executable)" do
+    file_path = File.join("script", "ride-console")
+    File.exists?(full_path(file_path)).should == true
+    FileTest.executable?(full_path(file_path)).should == true
+  end
+
   [%w{ftplugin ruby ruby.vim}, %w{plugin taglist.vim}, %w{syntax eruby.vim}, %w{ftdetect ruby.vim}].each do |vimfile|
     it "Should create #{vim_path = File.join(".vim", *vimfile)}" do
       File.exists?(full_path(vim_path)).should == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ride
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors: 
 - TJ Vanderpoel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: A Multi-User Console Interactive Development Environment Based On GNUScreen
 email: 
@@ -55,9 +55,9 @@ extra_rdoc_files:
 - Manifest.txt
 - PostInstall.txt
 - README.txt
-- app_generators/ride/templates/History.txt
-- app_generators/ride/templates/License.txt
-- app_generators/ride/templates/README.txt
+- app_generators/ride/templates/RIDE_History.txt
+- app_generators/ride/templates/RIDE_License.txt
+- app_generators/ride/templates/RIDE_README.txt
 - website/index.txt
 files: 
 - History.txt
@@ -72,9 +72,9 @@ files:
 - app_generators/ride/templates/.vim/ftplugin/ruby/ruby.vim
 - app_generators/ride/templates/.vim/plugin/taglist.vim
 - app_generators/ride/templates/.vim/syntax/eruby.vim
-- app_generators/ride/templates/History.txt
-- app_generators/ride/templates/License.txt
-- app_generators/ride/templates/README.txt
+- app_generators/ride/templates/RIDE_History.txt
+- app_generators/ride/templates/RIDE_License.txt
+- app_generators/ride/templates/RIDE_README.txt
 - app_generators/ride/templates/config/.screenrc.code.erb
 - app_generators/ride/templates/config/code_template.erb
 - app_generators/ride/templates/script/console