rda 0.3.1 → 0.3.2

data/Gemfile

@@ -12,3 +12,4 @@ gemspec
 
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
+gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rda (0.3.1)
+    rda (0.3.2)
       activesupport (>= 3.1)
       confstruct (~> 0.2)
       thor (~> 0.15)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: http://ruby.taobao.org/
   specs:
-    activesupport (3.2.6)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     coderay (1.0.7)
@@ -25,7 +25,7 @@ GEM
       guard (~> 1.1)
     guard-rspec (1.1.0)
       guard (>= 1.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
@@ -36,6 +36,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
+    rake (0.9.2.2)
     rb-fchange (0.0.5)
       ffi
     rb-fsevent (0.9.1)
@@ -62,6 +63,7 @@ DEPENDENCIES
   guard-bundler (~> 1.0)
   guard-rspec (~> 1.1)
   pry (~> 0.9.9)
+  rake
   rda!
   rspec (~> 2.10)
   ruby_gntp (~> 0.3)

data/bin/rda

@@ -3,12 +3,6 @@
 
 require 'rda'
 
-begin
-  Rda::Rails.app_name
-rescue LoadError
-  $stderr.puts "ERROR: You should run rda under rails applications"
-end
-
 class RdaCommand < Thor
   desc 'rvm ACTION', 'Set up RVM. Available actions: setup, discard.'
   def rvm(action)

data/lib/rda/app.rb

@@ -34,7 +34,7 @@ module Rda
     private
     def dir_of(dir)
       dir = File.join(Rda::Rails.root.to_s, dir)
-      FileUtils.mkdir_p dir unless Dir.exists?(dir)
+      FileUtils.mkdir_p dir unless File.directory?(dir)
 
       dir
     end

data/lib/rda/nginx.rb

@@ -41,7 +41,7 @@ module Rda
 
     private
     def installed?
-      Dir.exists?(conf_path) if conf_path
+      File.directory?(conf_path) if conf_path
     end
 
     def conf_path
@@ -70,7 +70,7 @@ module Rda
 
     def available_paths
       search_paths = Rda.config.nginx_conf_paths || []
-      @paths ||= search_paths.select { |p| Dir.exists? p if p } unless search_paths.empty?
+      @paths ||= search_paths.select { |p| File.directory? p if p } unless search_paths.empty?
     end
 
     def prompt_not_found
@@ -96,7 +96,7 @@ module Rda
     def mkdir_for_sites
       %W(available enabled).each do |n|
         dir = conf_path + "/sites-#{n}"
-        empty_directory(dir) unless Dir.exists?(dir)
+        empty_directory(dir) unless File.directory?(dir)
       end
     end
 
@@ -104,14 +104,14 @@ module Rda
       conf = conf_path + '/nginx.conf'
 
       unless configured?(conf, 'passenger_default_user')
-        gsub_file conf, /http {/, <<-PASSENGER
+        gsub_file conf, /http \{/, <<-PASSENGER
 http {
     passenger_default_user root;
         PASSENGER
       end
 
       unless configured?(conf, 'passenger_default_group')
-        gsub_file conf, /http {/, <<-PASSENGER
+        gsub_file conf, /http \{/, <<-PASSENGER
 http {
     passenger_default_group root;
         PASSENGER
@@ -121,7 +121,7 @@ http {
     def include_sites_enabled
       conf = conf_path + '/nginx.conf'
       unless configured?(conf, "include #{conf_path}/sites-enabled/*;")
-        gsub_file conf, /http {/, <<-INCLUDE_SITES_ENABLED
+        gsub_file conf, /http \{/, <<-INCLUDE_SITES_ENABLED
 http {
     include #{conf_path}/sites-enabled/*;
         INCLUDE_SITES_ENABLED

data/lib/rda/rails.rb

@@ -1,11 +1,19 @@
 module Rda
   module Rails
     def self.app_name
-      @app_name ||= IO.foreach(File.join(Dir.pwd, 'config.ru')) do |l|
-                      if l =~ /run\s+(.*)::Application/
-                        return $1.underscore.dasherize
+      @app_name ||= begin
+                      IO.foreach(File.join(Dir.pwd, 'config.ru')) do |l|
+                        if l =~ /run\s+(.*)::Application/
+                          return $1.underscore.dasherize
+                        end
                       end
+                    rescue
                     end
+
+      unless @app_name
+        $stderr.puts "ERROR: You should run rda under rails applications"
+        exit
+      end
     end
 
     def self.root

data/lib/rda/rvm.rb

@@ -26,7 +26,7 @@ module Rda
 
     private
     def installed?
-      rvm_path && Dir.exists?(rvm_path)
+      rvm_path && File.directory?(rvm_path)
     end
 
     def rvm_path

data/lib/rda/version.rb

@@ -1,3 +1,3 @@
 module Rda
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/lib/rda/nginx_spec.rb

@@ -12,9 +12,9 @@ describe Rda::Nginx do
   describe '#setup' do
     context 'when nginx is not found' do
       before do
-        Dir.should_receive(:exists?).with('/etc/nginx').and_return(false)
-        Dir.should_receive(:exists?).with('/usr/local/nginx/conf').and_return(false)
-        Dir.should_receive(:exists?).with('/opt/nginx/conf').and_return(false)
+        File.should_receive(:directory?).with('/etc/nginx').and_return(false)
+        File.should_receive(:directory?).with('/usr/local/nginx/conf').and_return(false)
+        File.should_receive(:directory?).with('/opt/nginx/conf').and_return(false)
       end
 
       it 'prompts nginx is not found' do
@@ -33,9 +33,9 @@ ERROR: Config directory of Nginx is not found in the following paths:
 
     context 'when found more than one config directory of nginx' do
       before do
-        Dir.should_receive(:exists?).with('/etc/nginx').and_return(true)
-        Dir.should_receive(:exists?).with('/usr/local/nginx/conf').and_return(true)
-        Dir.should_receive(:exists?).with('/opt/nginx/conf').and_return(false)
+        File.should_receive(:directory?).with('/etc/nginx').and_return(true)
+        File.should_receive(:directory?).with('/usr/local/nginx/conf').and_return(true)
+        File.should_receive(:directory?).with('/opt/nginx/conf').and_return(false)
       end
 
       it 'asks to choose one path' do
@@ -59,14 +59,14 @@ Found more than one config directory of Nginx, please choose one to setup:
     let(:dummy_path) { File.dirname(__FILE__) + "/../../tmp/nginx" }
 
     before do
-      FileUtils.mkdir_p dummy_path unless Dir.exists?(dummy_path)
+      FileUtils.mkdir_p dummy_path unless File.directory?(dummy_path)
       FileUtils.copy_file(File.dirname(__FILE__) + "/../../fixtures/nginx.conf", dummy_path + '/nginx.conf')
       Rda.configure { nginx_conf_paths [File.dirname(__FILE__) + "/../../tmp/nginx"] }
     end
 
     after do
       conf = Rda.config.nginx_conf_paths.first
-      FileUtils.rm_r conf if Dir.exists?(conf)
+      FileUtils.rm_r conf if File.directory?(conf)
 
       Rda.configure { nginx_conf_paths ['/etc/nginx', '/usr/local/nginx/conf', '/opt/nginx/conf'] }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rda
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -380761749312144692
+      hash: -4472563242875410737
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -380761749312144692
+      hash: -4472563242875410737
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24