rrails 1.0.0 → 1.1.0

data/Changes.md

@@ -1,4 +1,10 @@
+v1.0.1				2012-10-21 23:58:00 +0900
+ - FEATURE: config file suport. you can put config file at conf/rrails.yml and auto loaded.(thanks quark-zju)
+ - MOD: support using gem's command. (for example you can use annotate command on rrails.) (thanks quark-zju)
+ - FIX: uninitialized constant warnings when reloading rrails fixed. (thanks quark-zju)
+
 v1.0.0				2012-10-16 01:03:00 +0900
+------------------------------------------------------------------------
  - XXX: It may have many imcopatible changes. "1.0.0" does not mean "stable version".
  - MOD: support UNIXDomainSocket instead of TCPSocket. And UnixDomainSocket is default behaviour. So you can be easy to run rrails in many rails project. But you should run rrails clinet under your project's directory.(thanks quark-zju)
  - MOD: "rails-server" command is obsolate. please use "rrails start" instead. see more about README.md. (thanks quark-zju)

data/README.md

@@ -13,8 +13,8 @@ Without rrails:
 
 With rrails:
 
-    $ source <(rrails shellrc)
-    $ rrails start                         # optionally
+    $ source <(rrails shellrc)             # set aliases for rails and rake
+    $ rrails start                         # start the server, optionally
 
     $ time ( rails generate >/dev/null )
     ( rails generate > /dev/null; )  0.05s user 0.01s system 6% cpu 0.904 total
@@ -26,17 +26,26 @@ With rrails:
 * POSIX Environment (Linux 2.6 - , Mac OSX Montain Lion). Windows is not supported.
 * Ruby 1.9.3p194 or above
 
+## Installation
+
+Install from shell:
+
+    gem install rrails
+
+And it's done. No need to add rrails to Gemfile.
+
 ## Usage
 
-Run rails/rake commands using rrails:
+Run rails/rake and other commands using rrails:
 
     $ export RAILS_ENV=development         # optionally
-    $ rrails rails generate model Yakiniku # first command, slow
+    $ rrails rails generate model Yakiniku # first command, server starts on demand, slow
     $ rrails rails server                  # fast
     $ rrails rails console                 # fast
     $ rrails rake db:migrate               # fast
     $ rrails rake routes                   # fast
     $ rrails -- rake -T                    # '--' is needed. Otherwise '-T' will be parsed by rrails
+    $ rrails annotate                      # fast. "gem 'annotate'" should exist in Gemfile
 
 For more options, run:
 
@@ -102,6 +111,22 @@ You can control the server using:
     $ rrails reload
     $ rrails status
 
+### Configuration File
+
+`config/rrails.yml` will be auto loaded as default configuration. Here is an example of `rrails.yml`:
+
+    ---
+    development:
+      loglevel: 1
+      logfile: 'log/rrails.development.log'
+      background: true
+      host: '0.0.0.0'
+      port: 5050
+    production:
+      loglevel: 2
+      logfile: 'log/rrails.production.log'
+      ondemand: false
+
 ## See Also
 
 * guard-rrails: https://github.com/walf443/guard-rrails

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/bin/rrails

@@ -13,9 +13,15 @@ def chdir_to_project_root
   end
 end
 
+# default options
+options = {
+  ondemand:  true,
+  config:    './config/rrails.yml',
+  rails_env: ENV['RAILS_ENV'] || 'development',
+}
+
 # parse options
 require 'optparse'
-options = { ondemand: true }
 opts = OptionParser.new
 opts.banner =<<'!'
 Usage: rrails [options] [-- rails_or_rake_cmds]
@@ -27,16 +33,30 @@ Options:
 !
 opts.on('-h', '--help', 'Show this document.')      {}
 opts.on('-E', '--rails_env=s', 'Set Rails env.')      {|v| options[:rails_env] = v}
+opts.on('-C', '--config=s', "Set config file path. Default: #{options[:config]}") {|v| options[:config] = v}
 opts.on('-s', '--socket=s', 'Set RRails server socket file. If this is set, host and port are ignored.') {|v| options[:socket] = v}
 opts.on('--host=s', 'Set server hostname. Default: localhost.') {|v| options[:host] = v}
 opts.on('-p', '--port=i', 'Set server port. Default: decided by rails_env.') {|v| options[:port] = v}
-opts.on('--[no-]ondemand', '(Client) Start RRails server on demand. Default: true.') {|v| options[:ondemand] = v}
+opts.on('--[no-]ondemand', "(Client) Start RRails server on demand. Default: #{options[:ondemand]}.") {|v| options[:ondemand] = v}
 opts.on('-t', '--[no-]pty', "(Client) Prepare a PTY. Default: decided by commands.")  {|v| options[:pty] = v }
 opts.on('--logfile=s', '(Server) Set log file path. Default: (stderr).') {|v| options[:logfile] = v}
+opts.on('--loglevel=i', '(Server) Set log level (0 to 3). Default: 0.') {|v| options[:loglevel] = v}
 opts.on('--pidfile=s', '(Server) Set RRails server pidfile file.') {|v| options[:pidfile] = v}
 opts.on('-b', '--[no-]background', '(Server) Run in background.') {|v| options[:background] = v}
 opts.parse!(ARGV)
 
+# load user config
+config_path = options[:config]
+if File.exists?(config_path)
+  require 'yaml'
+  config  = YAML::load_file('config/rrails.yml')
+  config  = config[options[:rails_env]] || config
+  options.merge!(Hash[[*config.map {|k, *v| [k.to_sym, *v]}]])
+end
+
+# make sure command line options override others
+opts.parse!(ARGV)
+
 # run client or server
 case ARGV.first
 when nil, ''

data/lib/rrails/client.rb

@@ -20,9 +20,6 @@ module RemoteRails
 
       @rails_env = options[:rails_env] || ENV['RAILS_ENV'] || 'development'
 
-      @socket = "#{options[:socket] || './tmp/sockets/rrails-'}#{@rails_env}.socket"
-      @host = options[:host] || 'localhost'
-      @port = options[:port] || DEFAULT_PORT[@rails_env]
 
       @use_pty = options[:pty]
       @ondemand_callback = options[:ondemand_callback]
@@ -32,8 +29,12 @@ module RemoteRails
         @cmd = Shellwords.join(@cmd)
       end
 
-      if (options[:host] || options[:port]) && (!options[:socket])
+      if (options[:host] || options[:port]) && !options[:socket]
         @socket = nil
+        @host = options[:host] || 'localhost'
+        @port = options[:port] || DEFAULT_PORT[@rails_env]
+      else
+        @socket = "#{options[:socket] || './tmp/sockets/rrails-'}#{@rails_env}.socket"
       end
 
       if @use_pty.nil?

data/lib/rrails/server.rb

@@ -25,14 +25,16 @@ module RemoteRails
       @rails_env  = options[:rails_env] || ENV['RAILS_ENV'] || "development"
       @pidfile    = "#{options[:pidfile] || './tmp/pids/rrails-'}#{@rails_env}.pid"
       @background = options[:background] || false
-      @host       = options[:host] || 'localhost'
-      @port       = options[:port] || DEFAULT_PORT[@rails_env]
-      @socket     = "#{options[:socket] || './tmp/sockets/rrails-'}#{@rails_env}.socket"
       if (options[:host] || options[:port]) && !options[:socket]
-        @socket = nil
+        @socket   = nil
+        @host     = options[:host] || 'localhost'
+        @port     = options[:port] || DEFAULT_PORT[@rails_env]
+      else
+        @socket   = "#{options[:socket] || './tmp/sockets/rrails-'}#{@rails_env}.socket"
       end
       @app_path   = File.expand_path('./config/application')
       @logger     = Logger.new(options[:logfile] ? options[:logfile] : (@background ? nil : STDERR))
+      @logger.level = options[:loglevel] || 0
     end
 
     def stop
@@ -70,7 +72,7 @@ module RemoteRails
 
     def start
       # check previous process
-      raise RuntimeError.new('RRails is already running') if alive?
+      raise RuntimeError.new('rrails is already running') if alive?
 
       if @background
         pid = Process.fork do
@@ -267,7 +269,17 @@ module RemoteRails
         $0 = Gem.bin_path('rake')
         ::Rake.application.run
       else
-        STDERR.puts "#{cmd} is not supported in RRails."
+        # unknown binary, try to locate its location
+        bin_path = begin
+                     Gem.bin_path(cmd)
+                   rescue
+                     STDERR.puts "rrails: command not found: #{cmd}"
+                     STDERR.puts "Install missing gem executables with `bundle install`"
+                     exit(127)
+                   end
+
+        # then load it
+        load bin_path
       end
     end
 

data/lib/rrails.rb

@@ -1,7 +1,11 @@
 module RemoteRails
-  DEFAULT_PORT = {
-    "development" => 5656,
-    "test" => 5657,
-    "production" => 5658,
-  }
+
+  if not defined?(DEFAULT_PORT)
+    DEFAULT_PORT = {
+      "development" => 5656,
+      "test" => 5657,
+      "production" => 5658,
+    }
+  end
+
 end

data/rrails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rrails"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keiji, Yoshimi"]
-  s.date = "2012-10-15"
+  s.date = "2012-10-21"
   s.description = "remote run rails/rake command"
   s.email = "walf443@gmail.com"
   s.executables = ["rrails", "rrails-server"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4515075186478304892
+      hash: 3781868682991120205
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: