disco-railties 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb4edaf8d7730cac1b7aee99e76d4787c9f999e8
-  data.tar.gz: 9a59fcb5fbd0ba184be96b2a841d49904133af7f
+  metadata.gz: 8bcd7f76657f52933f7d043b9d43592a90e015b9
+  data.tar.gz: ac260928081d22700b5615f20035423c6a91e592
 SHA512:
-  metadata.gz: 08c020e57303faac06b204ea7e32941af49803e9b1ac13d00f95585afcffde9ec7c94bc96b5f5370b4590c09819fabe9f12de18aa86ae7bd0b4d92703b8fe6ad
-  data.tar.gz: 14061f37b132a63f96450c994ccb6e68dd6c71b08de49482d0f43936c42c20142b9d8c07dd6a5c1baf5bc97d0765a8a4133117ba950efd60d71ad63189eade8a
+  metadata.gz: a878018b0b4b9e879b543f4d0a918aac9ad0aa8d7e4b149d500dac4c12644bbecbc54b84b80c651f1ca02a7464140bc0286298d739a3dbde4a3705dffd9c8e60
+  data.tar.gz: b6fbdcb31bbcc1aa9c752f1d33cb46aa33f207ead4d8d99276e0697f7823f997805cbf0cf6fbe6c7eca9d41a0ea5b6b45502207fc83ce7b4682f4401887668f4

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright (c) 2013 Robert Kranz
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2013 Robert Kranz
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1 +1 @@
-Dir.glob('lib/tasks/*.rake').each {|r| import r}
+Dir.glob('lib/tasks/*.rake').each { |r| import r }

data/bin/disco

@@ -1,7 +1,7 @@
-#!/usr/bin/env ruby
-
-unless Gem::Specification.find_by_name('disco-railties').gem_dir == File.expand_path('../..', __FILE__)
-  $:.push File.expand_path('../../lib', __FILE__)
-  $:.delete "#{Gem::Specification.find_by_name('disco-railties').gem_dir}/lib"
-end
-require 'disco/cli'
+#!/usr/bin/env ruby
+
+unless Gem::Specification.find_by_name('disco-railties').gem_dir == File.expand_path('../..', __FILE__)
+  $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
+  $LOAD_PATH.delete "#{Gem::Specification.find_by_name('disco-railties').gem_dir}/lib"
+end
+require 'disco/cli'

data/lib/disco/app_disco_loader.rb

@@ -1,62 +1,65 @@
-require 'pathname'
-
-module Disco
-  module AppDiscoLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at('bindir', 'ruby_install_name')) + RbConfig::CONFIG['EXEEXT']
-    EXECUTABLES = ['bin/disco']
-    BUNDLER_WARNING = <<EOS
-Looks like your app's ./bin/disco is a stub that was generated by Bundler.
-
-In Rails Disco, your app's bin/ directory contains executables that are versioned
-like any other source code, rather than stubs that are generated on demand.
-
-Here's how to upgrade:
-
-  bundle config --delete bin    # Turn off Bundler's stub generator
-  rake disco:update:bin        # Use the new Rails Disco executables
-  git add bin                   # Add bin/ to source control
-
-You may need to remove bin/ from your .gitignore as well.
-
-When you install a gem whose executable you want to use in your app,
-generate it and add it to source control:
-
-  bundle binstubs some-gem-name
-  git add bin/new-executable
-
-EOS
-
-    def self.exec_app_disco
-      original_cwd = Dir.pwd
-
-      loop do
-        exe = find_executable
-        if exe
-          contents = File.read(exe)
-
-          if contents =~ /(APP|ENGINE)_PATH/
-            exec RUBY, exe, *ARGV
-            break # non reachable, hack to be able to stub exec in the test suite
-          elsif exe.end_with?('bin/disco') && contents.include?('This file was generated by Bundler')
-            $stderr.puts(BUNDLER_WARNING)
-            Object.const_set(:APP_PATH, File.expand_path('config/application', Dir.pwd))
-            require File.expand_path('../boot', APP_PATH)
-            require 'disco/commands'
-            break
-          end
-        end
-
-        # If we exhaust the search there is no executable, this could be a
-        # call to generate a new application, so restore the original cwd.
-        Dir.chdir(original_cwd) and return if Pathname.new(Dir.pwd).root?
-
-        # Otherwise keep moving upwards in search of a executable.
-        Dir.chdir('..')
-      end
-    end
-
-    def self.find_executable
-      EXECUTABLES.find { |exe| File.exists?(exe) }
-    end
-  end
-end
+require 'pathname'
+
+module Disco
+  module AppDiscoLoader
+    RUBY = File.join(*RbConfig::CONFIG.values_at('bindir', 'ruby_install_name')) + RbConfig::CONFIG['EXEEXT']
+    EXECUTABLES = ['bin/disco']
+    BUNDLER_WARNING = <<EOS
+Looks like your app's ./bin/disco is a stub that was generated by Bundler.
+
+In Rails Disco, your app's bin/ directory contains executables that are versioned
+like any other source code, rather than stubs that are generated on demand.
+
+Here's how to upgrade:
+
+  bundle config --delete bin    # Turn off Bundler's stub generator
+  rake disco:update:bin        # Use the new Rails Disco executables
+  git add bin                   # Add bin/ to source control
+
+You may need to remove bin/ from your .gitignore as well.
+
+When you install a gem whose executable you want to use in your app,
+generate it and add it to source control:
+
+  bundle binstubs some-gem-name
+  git add bin/new-executable
+
+EOS
+
+    def self.exec_app_disco
+      original_cwd = Dir.pwd
+
+      loop do
+        exe = find_executable
+        if exe
+          contents = File.read(exe)
+
+          if contents =~ /(APP|ENGINE)_PATH/
+            exec RUBY, exe, *ARGV
+            break # non reachable, hack to be able to stub exec in the test suite
+          elsif exe.end_with?('bin/disco') && contents.include?('This file was generated by Bundler')
+            $stderr.puts(BUNDLER_WARNING)
+            Object.const_set(:APP_PATH, File.expand_path('config/application', Dir.pwd))
+            require File.expand_path('../boot', APP_PATH)
+            require 'disco/commands'
+            break
+          end
+        end
+
+        # If we exhaust the search there is no executable, this could be a
+        # call to generate a new application, so restore the original cwd.
+        if Pathname.new(Dir.pwd).root?
+          Dir.chdir(original_cwd)
+          break
+        end
+
+        # Otherwise keep moving upwards in search of a executable.
+        Dir.chdir('..')
+      end
+    end
+
+    def self.find_executable
+      EXECUTABLES.find { |exe| File.exist?(exe) }
+    end
+  end
+end

data/lib/disco/cli.rb

@@ -1,11 +1,14 @@
-require 'rbconfig'
-require 'disco/app_disco_loader'
-
-# If we are inside a Rails application this method performs an exec and thus
-# the rest of this script is not run.
-Disco::AppDiscoLoader.exec_app_disco
-
-require 'rails/ruby_version_check'
-Signal.trap('INT') { puts; exit(1) }
-
-require 'disco/commands/application'
+require 'rbconfig'
+require 'disco/app_disco_loader'
+
+# If we are inside a Rails application this method performs an exec and thus
+# the rest of this script is not run.
+Disco::AppDiscoLoader.exec_app_disco
+
+require 'rails/ruby_version_check'
+Signal.trap('INT') do
+  puts
+  exit(1)
+end
+
+require 'disco/commands/application'

data/lib/disco/commands.rb

@@ -1,71 +1,74 @@
-ARGV << '--help' if ARGV.empty?
-
-aliases = {
-    'ds' => 'domainserver',
-    's' => 'server',
-    'ps' => 'projectionserver',
-    'g' => 'generate',
-    'd' => 'destroy',
-    '-h' => '--help',
-    '-v' => '--version',
-}
-
-help_message = <<-EOT
-Usage: disco COMMAND [ARGS]
-
-The most common disco commands are:
- generate(g)           Generate new Rails Disco code
- domainserver(ds)      Start the domain server
- projectionserver(ps)  Start the projection server
- server(s)             Start domain and projection server
- new                   Creates a new Rails Disco application
-                       "disco new my_app" creates a
-                       new application called MyApp in "./my_app"
-
-In addition to those, there are:
- application           Generate the Rails Disco application code
- destroy(d)            Undo code generated with "generate"
-
-All commands can be run with -h (or --help) for more information.
-EOT
-
-
-command = ARGV.shift
-command = aliases[command] || command
-
-case command
-  when 'generate', 'destroy'
-    require 'disco/generators'
-
-    require APP_PATH
-    Rails.application.require_environment!
-    Rails.application.load_generators
-
-    require "disco/commands/#{command}"
-
-  when 'server', 'domainserver', 'projectionserver'
-    Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path('config.ru'))
-
-    require "disco/commands/#{command}"
-
-  when 'new'
-    if %w(-h --help).include?(ARGV.first)
-      require 'disco/commands/application'
-    else
-      puts "Can't initialize a new Rails Disco application within the directory of another, please change to a non-Rails Disco directory first.\n"
-      puts "Type 'disco' for help."
-      exit(1)
-    end
-
-  when '--version'
-    require 'rails-disco/version'
-    puts "Rails Disco #{RailsDisco::VERSION::STRING}"
-
-  when '--help'
-    puts help_message
-
-  else
-    puts "Error: Command '#{command}' not recognized"
-    puts help_message
-    exit(1)
-end
+ARGV << '--help' if ARGV.empty?
+
+aliases = {
+  'ds' => 'domainserver',
+  's' => 'server',
+  'ps' => 'projectionserver',
+  'g' => 'generate',
+  'd' => 'destroy',
+  '-h' => '--help',
+  '-v' => '--version',
+}
+
+help_message = <<-EOT
+Usage: disco COMMAND [ARGS]
+
+The most common disco commands are:
+ generate(g)           Generate new Rails Disco code
+ domainserver(ds)      Start the domain server
+ projectionserver(ps)  Start the projection server
+ server(s)             Start domain and projection server
+ new                   Creates a new Rails Disco application
+                       "disco new my_app" creates a
+                       new application called MyApp in "./my_app"
+
+In addition to those, there are:
+ application           Generate the Rails Disco application code
+ destroy(d)            Undo code generated with "generate"
+
+All commands can be run with -h (or --help) for more information.
+EOT
+
+command = ARGV.shift
+command = aliases[command] || command
+
+case command
+when 'generate', 'destroy'
+  require 'disco/generators'
+
+  require APP_PATH
+  Rails.application.require_environment!
+  Rails.application.load_generators
+
+  require "disco/commands/#{command}"
+
+when 'server', 'domainserver', 'projectionserver'
+  Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exist?(File.expand_path('config.ru'))
+
+  require "disco/commands/#{command}"
+
+when 'new'
+  if %w(-h --help).include?(ARGV.first)
+    require 'disco/commands/application'
+  else
+    puts <<-EOT
+Can't initialize a new Rails Disco application within the directory of another.
+Please change to a non-Rails Disco directory first.
+
+Type 'disco' for help.
+EOT
+    exit(1)
+  end
+
+when '--version'
+  require 'rails-disco/version'
+  puts "Rails Disco #{RailsDisco::VERSION::STRING}"
+
+when '--help'
+  puts help_message
+
+else
+  puts "Error: Command '#{command}' not recognized"
+  puts help_message
+  exit(1)
+end

data/lib/disco/commands/application.rb

@@ -1,43 +1,43 @@
-require 'rails-disco/version'
-
-if ['--version', '-v'].include?(ARGV.first)
-  puts "Rails Disco #{RailsDisco::VERSION::STRING}"
-  exit(0)
-end
-
-if ARGV.first != "new"
-  ARGV[0] = "--help"
-else
-  ARGV.shift
-  unless ARGV.delete("--no-rc")
-    customrc = ARGV.index{ |x| x.include?("--rc=") }
-    railsrc = if customrc
-                File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ""))
-              else
-                File.join(File.expand_path("~"), '.railsrc')
-              end
-    if File.exist?(railsrc)
-      extra_args_string = File.read(railsrc)
-      extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
-      puts "Using #{extra_args.join(" ")} from #{railsrc}"
-      ARGV.insert(1, *extra_args)
-    end
-  end
-end
-
-require 'rails/generators'
-require 'generators/disco/app/app_generator'
-
-module Disco
-  module Generators
-    class AppGenerator # :nodoc:
-      # We want to exit on failure to be kind to other libraries
-      # This is only when accessing via CLI
-      def self.exit_on_failure?
-        true
-      end
-    end
-  end
-end
-
-Disco::Generators::AppGenerator.start
+require 'rails-disco/version'
+
+if %w(--version -v).include?(ARGV.first)
+  puts "Rails Disco #{RailsDisco::VERSION::STRING}"
+  exit(0)
+end
+
+if ARGV.first != 'new'
+  ARGV[0] = '--help'
+else
+  ARGV.shift
+  unless ARGV.delete('--no-rc')
+    customrc = ARGV.index { |x| x.include?('--rc=') }
+    railsrc = if customrc
+                File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ''))
+              else
+                File.join(File.expand_path('~'), '.railsrc')
+              end
+    if File.exist?(railsrc)
+      extra_args_string = File.read(railsrc)
+      extra_args = extra_args_string.split(/\n+/).map { |l| l.split }.flatten
+      puts "Using #{extra_args.join(' ')} from #{railsrc}"
+      ARGV.insert(1, *extra_args)
+    end
+  end
+end
+
+require 'rails/generators'
+require 'generators/disco/app/app_generator'
+
+module Disco
+  module Generators
+    class AppGenerator # :nodoc:
+      # We want to exit on failure to be kind to other libraries
+      # This is only when accessing via CLI
+      def self.exit_on_failure?
+        true
+      end
+    end
+  end
+end
+
+Disco::Generators::AppGenerator.start