ride 0.4.3 → 0.4.8

data/Manifest.txt

@@ -14,6 +14,7 @@ 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/.irbrc
+app_generators/ride/templates/.vimrc
 app_generators/ride/templates/config/.screenrc.code.erb
 app_generators/ride/templates/config/code_template_ruby.erb
 app_generators/ride/templates/config/code_template_rails.erb

data/app_generators/ride/ride_generator.rb

@@ -6,7 +6,7 @@ class RideGenerator < RubiGen::Base
   # These get passed into options
   default_options :author => nil, :language => "ruby", :shell => 'bash', :template_type => 'ramaze', :editor => 'vim', :console_debugger => 'script/ride-console'
 
-  attr_reader :name, :main_lib, :shell, :editor, :template_type, :language, :screen_name, :console_debugger
+  attr_reader :name, :main_lib, :shell, :editor, :template_type, :language, :screen_name, :console_debugger, :shell
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -23,7 +23,7 @@ class RideGenerator < RubiGen::Base
     ruby_defaults = { :controller_base => nil, :view_base => nil, :model_base => nil, :test_base => "/spec/" }
     puts "Options: " + options.inspect
     puts 'template: ' + @template_type.to_s
-    defaults = case @template_type
+    defaults = case @template_type.to_s
     when "ramaze"
       ramaze_defaults
     when "rails"
@@ -53,7 +53,7 @@ class RideGenerator < RubiGen::Base
 
       #m.dependency "install_rubigen_scripts", [destination_root, 'ride'],
       #  :shebang => options[:shebang], :collision => :force
-      m.file_copy_each %w{RIDE_History.txt RIDE_License.txt RIDE_README.txt .irbrc}
+      m.file_copy_each %w{RIDE_History.txt RIDE_License.txt RIDE_README.txt .vimrc .irbrc}
       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}
@@ -81,12 +81,12 @@ EOS
       # opts.on("-a", "--author=\"Your Name\"", String,
       #         "Some comment about this option",
       #         "Default: none") { |options[:author]| }
-      opts.on("-l", "--language", String, "Language to develop in" "Default: ruby") { |options[:language]| }
-      opts.on("-t", "--template", String, "Project template" "Default: ramaze (ramaze, rails, newgem are supported)") { |options[:template_type]| }
-      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/ride-console") { |options[:console_debugger]| }
+      opts.on("--language EDITOR", String, "Language to develop in" ,"Default: ruby") { |options[:language]| }
+      opts.on("--template TEMPLATE", String, "Project template (support ramaze, rails, newgem)", "Default: ramaze") { |x| options[:project_type] = x }
+      opts.on("--editor EDITOR", String, "Editor to use", "Default: vim") { |options[:editor]| }
+      opts.on("--shell SHELL", String, "Shell to use", "Default: bash") { |options[:shell]| }
+      opts.on("--name NAME", String, "What to name the screen session", "Default: #{@name}") { |options[:screen_name]| }
+      opts.on("--debugger SCRIPT", 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
 
@@ -95,7 +95,8 @@ EOS
       # Templates can access these value via the attr_reader-generated methods, but not the
       # raw instance variable value.
       # @author = options[:author]
-      @template_type = options[:template_type]
+      @template_type = options[:project_type]
+      puts "Extracted #{template_type} as template_type"
       @language = options[:language]
       @main_dir = options[:main_dir]
       @shell = options[:shell]

data/app_generators/ride/templates/.irbrc

@@ -6,4 +6,6 @@ end
 
 require "rubygems"
 require "ride"
-require "std_err_hooks"
+if ENV['RIDE_DEBUG']
+  require "std_err_hooks"
+end

data/app_generators/ride/templates/.vimrc

@@ -0,0 +1,40 @@
+try " read in your vimrc first
+  source $REAL_HOME/.vimrc
+catch /E484/
+endtry
+
+if has("autocmd")
+ " Enabled file type detection
+ " Use the default filetype settings from plugins
+ " do language-dependent indenting as well.
+ filetype plugin on
+ filetype indent on
+endif " has ("autocmd")
+
+" This section returns to the last place you were in a file
+" When you repoen it. Comment out to disable this behavior
+if has("autocmd")
+  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") 
+  \| execute "normal g'\"" | endif
+endif
+
+syntax on
+set backspace=indent,eol,start	" more powerful backspacing
+set tabstop=2    " Set the default tabstop
+set shiftwidth=2 " Set the default shift width for indents
+set expandtab   " Make tabs into spaces (set by tabstop)
+set smartcase		" Do case insensitive matching
+set smarttab " Smarter tab levels
+set ruler  " Show ruler
+set textwidth=0		" Don't wrap lines by default
+set pastetoggle=<F6> " F6 will toggle between paste and normal
+                      " Insert mode
+set history=50		" keep 50 lines of command line history
+
+" Extra For Rails
+let g:rubycomplete_rails = 1
+
+" set background=dark " If you have a dark background, uncomment this
+
+" For our local plugins and files
+set runtimepath+=~/.vim

data/lib/ride/version.rb

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

data/spec/ride_generator_spec.rb

@@ -12,7 +12,7 @@ module RideGeneratorSpecHelper
   end
 
   def full_path(some_path)
-    File.join(APP_ROOT, some_path)
+    File.join(APP_ROOT, @template_type, some_path)
   end
 end
 
@@ -23,7 +23,8 @@ describe "Ride Rails Generator", "when rails application is generated" do
   include RideGeneratorSpecHelper
   before(:all) do  
     bare_setup
-    run_generator('ride', [APP_ROOT], sources, {:console_debugger => 'irb', :template => 'rails', :shell => 'bash', :editor => 'vim'})
+    @template_type = 'rails'
+    run_generator('ride', [File.join(APP_ROOT,@template_type)], sources, {:console_debugger => 'irb', :project_type => @template_type, :shell => 'bash', :editor => 'vim'})
   end
 
   RideGenerator::BASEDIRS.each do |dir|
@@ -32,7 +33,7 @@ describe "Ride Rails Generator", "when rails application is generated" do
     end
   end
 
-  %w{RIDE_History.txt RIDE_License.txt RIDE_README.txt .irbrc}.each do |file|
+  %w{RIDE_History.txt RIDE_License.txt RIDE_README.txt .vimrc .irbrc}.each do |file|
     it "should create #{file}" do
       File.exists?(full_path(file)).should == true
     end
@@ -82,7 +83,7 @@ describe "Ride Rails Generator", "when rails application is generated" do
   end
 
   after(:all) do
-    bare_teardown
+    #bare_teardown
   end
   
 end
@@ -91,8 +92,9 @@ end
 describe "Ride Ramaze Generator", "when ramaze application is generated" do
   include RideGeneratorSpecHelper
   before(:all) do  
+    @template_type = 'ramaze'
     bare_setup
-    run_generator('ride', [APP_ROOT], sources, {:console_debugger => 'irb', :template => 'ramaze', :shell => 'bash', :editor => 'vim'})
+    run_generator('ride', [File.join(APP_ROOT, @template_type)], sources, {:console_debugger => 'irb', :project_type => @template_type, :shell => 'bash', :editor => 'vim'})
   end
 
   RideGenerator::BASEDIRS.each do |dir|
@@ -101,7 +103,7 @@ describe "Ride Ramaze Generator", "when ramaze application is generated" do
     end
   end
 
-  %w{RIDE_History.txt RIDE_License.txt RIDE_README.txt .irbrc}.each do |file|
+  %w{RIDE_History.txt RIDE_License.txt RIDE_README.txt .vimrc .irbrc}.each do |file|
     it "should create #{file}" do
       File.exists?(full_path(file)).should == true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ride
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.8
 platform: ruby
 authors: 
 - TJ Vanderpoel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -06:00
+date: 2009-01-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - app_generators/ride/templates/RIDE_License.txt
 - app_generators/ride/templates/RIDE_README.txt
 - app_generators/ride/templates/.irbrc
+- app_generators/ride/templates/.vimrc
 - app_generators/ride/templates/config/.screenrc.code.erb
 - app_generators/ride/templates/config/code_template_ruby.erb
 - app_generators/ride/templates/config/code_template_rails.erb