webbynode 1.0.3.beta4 → 1.0.3

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 require 'echoe'  
   
-Echoe.new('webbynode', '1.0.3.beta4') do |p|  
+Echoe.new('webbynode', '1.0.3') do |p|  
   p.description     = "Webbynode Deployment Gem"  
   p.url             = "http://webbynode.com"  
   p.author          = "Felipe Coury"

data/lib/webbynode/commands/init.rb

@@ -46,6 +46,19 @@ module Webbynode::Commands
       
       io.log "Application #{@app_name} ready for Rapid Deployment", :finish
       
+    rescue Net::SSH::HostKeyMismatch
+      io.log ""
+      io.log "Error pushing to your server:"
+      io.log "  #{$!}"
+      io.log ""
+      io.log "This usually happens because you redeployed the server and the fingerprint changed."
+      io.log ""
+      io.log "To fix this error:"
+      io.log "  1. Edit #{Webbynode::Io.home_dir}/.ssh/known_hosts file"
+      io.log "     or the proper known hosts file for your SSH service."
+      io.log "  2. Remove the line that starts with the IP #{@webby_ip}."
+      io.log ""
+
     rescue Webbynode::InvalidAuthentication
       io.log "Could not connect to webby: invalid authentication.", true
 

data/lib/webbynode/engines/all.rb

@@ -13,6 +13,7 @@ module Webbynode::Engines
     # order matters!
     Webbynode::Engines::Rails3,
     Webbynode::Engines::Rails,
-    Webbynode::Engines::Rack
+    Webbynode::Engines::Rack,
+    Webbynode::Engines::NodeJS
   ]
 end

data/lib/webbynode/engines/nodejs.rb

@@ -2,5 +2,42 @@ module Webbynode::Engines
   class NodeJS
     include Engine
     set_name "NodeJS"
+
+    def detected?
+      io.file_exists?('server.js')
+    end
+    
+    def prepare
+      default_port = 8000
+      if io.file_exists?('server.js')
+        contents = io.read_file('server.js')
+        if contents =~ /listen\((\d+)\)/
+          default_port = $1
+        end
+      end
+      
+      io.log ""
+      io.log "Configure NodeJS Application"
+      io.log ""
+
+      while true
+        proxy = ask("  Proxy requests (Y/n) [Y]? ")
+        proxy = 'Y' if proxy.blank?
+        break if "YN".include?(proxy.to_s.upcase)
+        io.log ""
+        io.log "  Please answer Y=use proxy or N=don't use proxy (standalone NodeJS app)"
+      end
+      
+      while true
+        port = ask("     Listening port [#{default_port}]: ")
+        port = "#{default_port}" if port.blank?
+        break if port.to_i.to_s == port.to_s
+        io.log ""
+        io.log "  Please enter a numeric value for port"
+      end
+      
+      io.add_setting('nodejs_proxy', proxy)
+      io.add_setting('nodejs_port',  port.to_s)
+    end
   end
 end

data/lib/webbynode.rb

@@ -56,7 +56,7 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'user')
 require File.join(File.dirname(__FILE__), 'webbynode', 'application')
 
 module Webbynode
-  VERSION = '1.0.3.beta4'
+  VERSION = '1.0.3'
 end
 
 class Array

data/spec/webbynode/commands/init_spec.rb

@@ -79,6 +79,29 @@ describe Webbynode::Commands::Init do
     end
   end
   
+  describe 'when the SSH known_hosts key differs' do
+    it "gives an user friendly explanation" do
+      io_handler.stub!(:file_exists?).with(".pushand").and_return(false)
+
+      git_handler.stub!(:present?).and_return(:false)
+
+      subject.stub!(:git).and_return(git_handler)
+      subject.stub!(:detect_engine).and_return(Webbynode::Engines::Rails)
+
+      subject.should_receive(:add_remote).and_raise(Net::SSH::HostKeyMismatch.new("fingerprint 91:b5:b6:08:91:61:f7:d7:66:ec:c0:a9:53:16:c6:84 does not match for \"208.88.124.171\""))
+      
+      io_handler.should_receive(:log).with("Error pushing to your server:")
+      io_handler.should_receive(:log).with("  fingerprint 91:b5:b6:08:91:61:f7:d7:66:ec:c0:a9:53:16:c6:84 does not match for \"208.88.124.171\"")
+      io_handler.should_receive(:log).with("This usually happens because you redeployed the server and the fingerprint changed.")
+      io_handler.should_receive(:log).with("To fix this error:")
+      io_handler.should_receive(:log).with("  1. Edit #{Webbynode::Io.home_dir}/.ssh/known_hosts file")
+      io_handler.should_receive(:log).with("     or the proper known hosts file for your SSH service.")
+      io_handler.should_receive(:log).with("  2. Remove the line that starts with the IP 201.81.121.201.")
+      
+      subject.run
+    end
+  end
+  
   describe 'using alternate port' do
     subject do 
       Webbynode::Commands::Init.new('2.1.2.3', '--port=2020').tap do |cmd|

data/spec/webbynode/engines/engine_spec.rb

@@ -8,6 +8,7 @@ describe Webbynode::Engines do
       subject.find('rails').should == Webbynode::Engines::Rails
       subject.find('rails3').should == Webbynode::Engines::Rails3
       subject.find('django').should == Webbynode::Engines::Django
+      subject.find('nodejs').should == Webbynode::Engines::NodeJS
       subject.find('rack').should == Webbynode::Engines::Rack
       subject.find('php').should == Webbynode::Engines::Php
     end

data/spec/webbynode/engines/nodejs_spec.rb

@@ -2,6 +2,14 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'spec_helper')
 
 describe Webbynode::Engines::NodeJS do
+  let(:io) { double("io").as_null_object }
+
+  subject do
+    Webbynode::Engines::NodeJS.new.tap do |engine|
+      engine.stub!(:io).and_return(io)
+    end
+  end
+
   describe 'class methods' do
     subject { Webbynode::Engines::NodeJS }
 
@@ -9,4 +17,76 @@ describe Webbynode::Engines::NodeJS do
     its(:engine_name)  { should == 'NodeJS' }
     its(:git_excluded) { should be_empty }
   end
+
+  describe '#detect' do
+    it "returns true if server.js is found" do
+      io.stub!(:file_exists?).with('server.js').and_return(true)
+      
+      subject.should be_detected
+    end
+
+    it "returns false if any isn't found" do
+      io.stub!(:file_exists?).with('server.js').and_return(false)
+      
+      subject.should_not be_detected
+    end
+  end
+  
+  describe '#prepare' do
+    before(:each) do
+      io.stub!(:file_exists?).with('server.js').and_return(false)
+    end
+    
+    it "tries to get the listen port" do
+      io.stub!(:file_exists?).with('server.js').and_return(true)
+      io.should_receive(:read_file).with("server.js").and_return(read_fixture("nodejs/server.js"))
+      subject.should_receive(:ask).with("  Proxy requests (Y/n) [Y]? ").and_return('Y')
+      subject.should_receive(:ask).with("     Listening port [1234]: ").and_return('')
+
+      io.should_receive(:add_setting).with('nodejs_port', '1234')
+
+      subject.prepare
+    end
+    
+    it "shows a title" do
+      io.should_receive(:log).with("Configure NodeJS Application")
+      subject.should_receive(:ask).with("  Proxy requests (Y/n) [Y]? ").and_return('Y')
+      subject.should_receive(:ask).with("     Listening port [8000]: ").and_return(8080)
+      subject.prepare
+    end
+    
+    it "validates y/n for proxy" do
+      subject.should_receive(:ask).with("  Proxy requests (Y/n) [Y]? ").and_return('abcdef')
+      io.should_receive(:log).with("  Please answer Y=use proxy or N=don't use proxy (standalone NodeJS app)")
+      subject.should_receive(:ask).with("  Proxy requests (Y/n) [Y]? ").and_return('N')
+      subject.should_receive(:ask).with("     Listening port [8000]: ").and_return(8080)
+      subject.prepare
+    end
+    
+    it "validates numeric for port" do
+      subject.should_receive(:ask).with("  Proxy requests (Y/n) [Y]? ").and_return('N')
+      subject.should_receive(:ask).with("     Listening port [8000]: ").and_return('abcdef')
+      io.should_receive(:log).with("  Please enter a numeric value for port")
+      subject.should_receive(:ask).with("     Listening port [8000]: ").and_return("8080")
+      subject.prepare
+    end
+    
+    it "asks if user wants to proxy requests and the port" do
+      io.should_receive(:add_setting).with('nodejs_proxy', 'Y')
+      io.should_receive(:add_setting).with('nodejs_port', '8080')
+
+      subject.should_receive(:ask).with("  Proxy requests (Y/n) [Y]? ").and_return('Y')
+      subject.should_receive(:ask).with("     Listening port [8000]: ").and_return(8080)
+      subject.prepare
+    end
+    
+    it "assumes default values" do
+      io.should_receive(:add_setting).with('nodejs_proxy', 'Y')
+      io.should_receive(:add_setting).with('nodejs_port', '8000')
+
+      subject.should_receive(:ask).with("  Proxy requests (Y/n) [Y]? ").and_return('')
+      subject.should_receive(:ask).with("     Listening port [8000]: ").and_return('')
+      subject.prepare
+    end
+  end
 end

data/webbynode.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webbynode}
-  s.version = "1.0.3.beta4"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Coury"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-09-22}
   s.description = %q{Webbynode Deployment Gem}
   s.email = %q{felipe@webbynode.com}
   s.executables = ["webbynode", "wn"]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webbynode
 version: !ruby/object:Gem::Version 
-  hash: -1848230060
-  prerelease: true
+  hash: 17
+  prerelease: false
   segments: 
   - 1
   - 0
   - 3
-  - beta4
-  version: 1.0.3.beta4
+  version: 1.0.3
 platform: ruby
 authors: 
 - Felipe Coury
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -03:00
+date: 2010-09-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency