capistrano_rails_console 0.5.2 → 0.5.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.5.3
+
+* don't require username or port [@spikegrobstein, #2]
+
 ## v0.5.2
 
 * test integration in `cap`

data/Rakefile

@@ -3,20 +3,24 @@ require "bundler/gem_tasks"
 require "rspec"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new("spec") do |spec|
+RSpec::Core::RakeTask.new("test:spec") do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-desc "Run integration test"
-task :integration do
-  puts
-  puts "Start integration test"
-  unless `cap -T` =~ /rails:console/
-    puts "Integration test fails!"
-    exit!
-  else
-    puts "Integration test successfully!"
+namespace :test do
+  desc "Run integration test"
+  task :integration do
+    puts
+    puts "Start integration test"
+    unless `cap -T` =~ /cap\ rails:console/
+      puts "Integration test fails!"
+      exit!
+    else
+      puts "Integration test successfully!"
+    end
   end
 end
 
-task :default => [:spec, :integration]
+desc "Run integration tests and specs"
+task :test => ["test:spec", "test:integration"]
+task :default => :test

data/lib/capistrano_rails_console/recipes.rb

@@ -11,7 +11,13 @@ module CapistranoRailsConsole
             hostname = find_servers_for_task(current_task).first
 
             console_command = CapistranoRailsConsole::Rails.console_command % rails_env
-            run_locally "ssh -l #{user} #{hostname} -p #{port} -t 'cd #{current_path} && #{console_command}'"
+            local_ssh_command = ["ssh"]
+            local_ssh_command << "-l #{user}" if fetch(:user, nil)
+            local_ssh_command << hostname
+            local_ssh_command << "-p #{port}" if fetch(:port, nil)
+            local_ssh_command << "-t 'cd #{current_path} && #{console_command}'"
+
+            run_locally(local_ssh_command.join(" "))
           end
         end
       end

data/lib/capistrano_rails_console/version.rb

@@ -1,3 +1,3 @@
 module CapistranoRailsConsole
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/recipes_spec.rb

@@ -4,11 +4,10 @@ require "capistrano/shell"
 describe CapistranoRailsConsole::Recipes, "loaded into a configuration" do
   describe "rails:console" do
     before do
-      [:rails_env, :user, :current_path].each do |key|
-        configuration.set key, "#{key}"
-      end
-      configuration.set :port, 22
       configuration.role :app, "example.com"
+      configuration.set :rails_env, "rails_env"
+      configuration.set :current_path, "current_path"
+      CapistranoRailsConsole::Rails.stub(:console_command => "command %s")
     end
 
     let :configuration do
@@ -17,19 +16,55 @@ describe CapistranoRailsConsole::Recipes, "loaded into a configuration" do
       configuration.extend Capistrano::Spec::ConfigurationExtension
     end
 
-    it "defines rails:console" do
-      configuration.find_task('rails:console').should_not be_nil
+    context "normal operations" do
+      before do
+        configuration.set :user, "user"
+        configuration.set :port, 22
+      end
+
+      it "defines rails:console" do
+        configuration.find_task('rails:console').should_not be_nil
+      end
+
+      it "should call 'CapistranoRailsConsole::Rails.console_command'" do
+        CapistranoRailsConsole::Rails.should_receive(:console_command).once.and_return("")
+        configuration.find_and_execute_task "rails:console"
+      end
+
+      it "should run the remote command" do
+        configuration.find_and_execute_task "rails:console"
+        configuration.should have_run_locally "ssh -l user example.com -p 22 -t 'cd current_path && command rails_env'"
+      end
     end
 
-    it "should call 'CapistranoRailsConsole::Rails.console_command'" do
-      CapistranoRailsConsole::Rails.should_receive(:console_command).once.and_return("")
-      configuration.find_and_execute_task "rails:console"
+    context "when port is not defined" do
+      before do
+        configuration.set :user, "user"
+      end
+
+      it "should not blow up" do
+        lambda { configuration.find_and_execute_task('rails:console') }.should_not raise_error
+      end
+
+      it "should not include the port in the command" do
+        configuration.find_and_execute_task "rails:console"
+        configuration.should have_run_locally "ssh -l user example.com -t 'cd current_path && command rails_env'"
+      end
     end
 
-    it "should run the remote command" do
-      CapistranoRailsConsole::Rails.stub(:console_command => "command %s")
-      configuration.find_and_execute_task "rails:console"
-      configuration.should have_run_locally "ssh -l user example.com -p 22 -t 'cd current_path && command rails_env'"
+    context "when the user is not defined" do
+      before do
+        configuration.set :port, 22
+      end
+
+      it "should not blow up" do
+        lambda { configuration.find_and_execute_task('rails:console') }.should_not raise_error
+      end
+
+      it "shoudl not include the login in the path" do
+        configuration.find_and_execute_task "rails:console"
+        configuration.should have_run_locally "ssh example.com -p 22 -t 'cd current_path && command rails_env'"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_rails_console
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1881473115402274885
+      hash: -2525387992721803318
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1881473115402274885
+      hash: -2525387992721803318
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24