webbynode 1.0.5.beta5 → 1.0.5.beta6

data/Gemfile

@@ -5,7 +5,7 @@ gem 'domainatrix'
 gem 'net-ssh'
 gem 'highline'
 gem 'rainbow'
-gem 'taps'
+gem 'taps', '0.3.23'
 
 group :development do
   gem 'rspec'

data/Gemfile.lock

@@ -12,12 +12,12 @@ GEM
     diff-lcs (1.1.2)
     domainatrix (0.0.7)
       addressable
-    echoe (4.5.1)
+    echoe (4.5.6)
       allison
       gemcutter
       rubyforge
     fakeweb (1.3.0)
-    gemcutter (0.6.1)
+    gemcutter (0.7.0)
     growl (1.0.3)
     guard (0.3.0)
       open_gem (~> 1.4.2)
@@ -27,7 +27,7 @@ GEM
     highline (1.6.1)
     httparty (0.7.4)
       crack (= 0.1.8)
-    json_pure (1.5.1)
+    json_pure (1.5.3)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
@@ -35,12 +35,12 @@ GEM
     net-ssh (2.1.0)
     open_gem (1.4.2)
       launchy (~> 0.3.5)
-    rack (1.2.1)
+    rack (1.3.2)
     rainbow (1.1.1)
     rake (0.8.7)
     rb-fsevent (0.4.0)
     rcov (0.9.9)
-    rest-client (1.6.1)
+    rest-client (1.6.3)
       mime-types (>= 1.16)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -55,12 +55,12 @@ GEM
     sequel (3.20.0)
     sinatra (1.0)
       rack (>= 1.0)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    taps (0.3.19)
+    taps (0.3.23)
       rack (>= 1.0.1)
-      rest-client (< 1.7.0, >= 1.4.0)
+      rest-client (>= 1.4.0, < 1.7.0)
       sequel (~> 3.20.0)
       sinatra (~> 1.0.0)
       sqlite3-ruby (~> 1.2)
@@ -87,4 +87,4 @@ DEPENDENCIES
   rb-fsevent
   rcov
   rspec
-  taps
+  taps (= 0.3.23)

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 require 'echoe'  
   
-Echoe.new('webbynode', '1.0.5.beta5') do |p|  
+Echoe.new('webbynode', '1.0.5.beta6') do |p|  
   p.description     = "Webbynode Deployment Gem"  
   p.url             = "http://webbynode.com"  
   p.author          = "Felipe Coury"
@@ -46,6 +46,24 @@ wn guides
 "
 end
 
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
+end
+
+desc "Generate code coverage"
+RSpec::Core::RakeTask.new(:coverage) do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end
+
 require 'rcov/rcovtask'
 desc 'Measures test coverage using rcov'
 namespace :rcov do

data/lib/webbynode/commands/change_dns.rb

@@ -17,7 +17,7 @@ module Webbynode::Commands
       handle_dns param(:dns_entry)
       
       app_name = io.app_name
-      io.create_file(".pushand", "#! /bin/bash\nphd $0 #{app_name} #{param(:dns_entry)}\n", true)
+      pushand.create!(app_name, param(:dns_entry))
 
       git.add ".pushand"
       git.add ".webbynode/settings" if io.file_exists?(".webbynode/settings")
@@ -29,6 +29,9 @@ module Webbynode::Commands
       end
 
       io.log "Your application will start responding to #{param(:dns_entry)} after next deployment."
+    rescue Webbynode::ApiClient::InactiveZone
+      io.log "Domain #{$!.message.color(:yellow)} already setup on Webbynode DNS, but it's inactive."
+      io.log "Please reactivate it and try again."
     end
   end
 end

data/lib/webbynode/commands/database.rb

@@ -3,13 +3,17 @@ module Webbynode::Commands
     summary "Manages your application database"
 
     add_alias "db"
-    allowed_actions %w(pull push)
+    allowed_actions %w(pull push config)
     
     option :debug, "Show server communication steps"
     
     requires_initialization!
     attr_reader :db
     
+    def default
+      io.log "Missing action: use #{"pull".color(:yellow)}, #{"push".color(:yellow)} or #{"config".color(:yellow)}. For more help use #{"#{File.basename $0} help database".color(:yellow)}."
+    end
+    
     def pull
       go :pull
     end
@@ -18,6 +22,10 @@ module Webbynode::Commands
       go :push
     end
     
+    def config
+      ask_db_credentials(true)
+    end
+    
     def go(action)
       ask_db_credentials
       
@@ -31,19 +39,38 @@ module Webbynode::Commands
         io.log ""
         io.log "Retrieving contents from #{db_name} database in #{ip}..."
       end
-
+      
       taps = Webbynode::Taps.new(db_name, password, io, remote_executor)
       taps.debug = option(:debug)
       begin
+        io.log "Checking for dependencies..." if option(:debug)
+        taps.ensure_gems!
+
         io.log "Starting taps in server mode..." if option(:debug)
         taps.start
+
         io.log "Waiting for taps to start..." if option(:debug)
         sleep 4
+
         io.log "Sending action #{action} with db #{db[:name]}..." if option(:debug)
         taps.send(action, :user => db[:user], 
           :password     => db[:password],
           :database     => db[:name],
           :remote_ip    => ip)
+      rescue TapsError
+        if $!.message =~ /LoadError: no such file to load -- (.*)/
+          io.log "#{"ERROR:".color(:red)} Missing database adapter. You need to install #{$1.color(:yellow)} gem to handle your database."
+        elsif $!.message =~ /Mysql::Error: Unknown database '(.*)'/
+          io.log "#{"ERROR:".color(:red)} Unknown database #{$1.color(:yellow)}. Create the local database and try again."
+        elsif $!.message =~ /Sequel::DatabaseConnectionError -\> Mysql::Error: (.*)/
+          io.log "#{"ERROR:".color(:red)} Invalid MySQL credentials for your local database (#{$1})"
+        else
+          if $!.message =~ /(.*) -\> (.*)/
+            io.log "#{"ERROR:".color(:red)} Unexpected error - #{$2}"
+          else
+            io.log "#{"ERROR:".color(:red)} Unexpected error - #{$!.message}"
+          end
+        end
       ensure
         io.log "Stopping taps server..."
         taps.finish
@@ -64,16 +91,16 @@ module Webbynode::Commands
       }
     end
     
-    def ask_db_credentials
+    def ask_db_credentials(force=false)
       retrieve_db_credentials
       
-      unless db[:name]
-        db[:name] = query("Database name", io.db_name)
-        db[:user] = query("    User name", io.db_name)
+      if force || db[:name].nil?
+        db[:name] = query("Database name", db[:name] || io.db_name)
+        db[:user] = query("    User name", db[:user] || io.db_name)
       end
       
       save_password = false
-      unless db[:password]
+      if force || db[:password].nil?
         db[:password] = query("     Password", "")
         save_password = ask("Save password (y/n)? ").downcase == 'y'
       end

data/lib/webbynode/commands/init.rb

@@ -5,7 +5,9 @@ module Webbynode::Commands
     option :dns, String, "The DNS used for this application"
     option :adddns, "Creates the DNS entries for the domain"
     option :port, "Specifies an alternate SSH port to connect to Webby", :validate => :integer
-    option :engine, "Sets the application engine for the app", :validate => { :in => ['php', 'rack', 'rails', 'rails3'] }
+    option :engine, "Sets the application engine for the app", :validate => { 
+      :in => ['php', 'rack', 'rails', 'rails3', 'html', 'wsgi', 'django', 'nodejs'] 
+    }
     option :trial, "Initializes this app for Rapp Trial"
     
     def execute
@@ -69,6 +71,13 @@ module Webbynode::Commands
       io.log "Application already initialized.".color(:red)
     end
     
+    def create_pushand
+      return if pushand_exists? && !@overwrite
+
+      io.log ""
+      pushand.create!(@app_name, @dns_entry)
+    end
+    
     private
     
     def check_git_clean
@@ -114,13 +123,6 @@ module Webbynode::Commands
       io.file_exists?(".pushand")
     end
     
-    def create_pushand
-      return if pushand_exists? && !@overwrite
-
-      io.log ""
-      io.create_file(".pushand", "#! /bin/bash\nphd $0 #{@app_name} #{@dns_entry}\n", true)
-    end
-    
     def create_git_commit
       io.log "Initializing git and applying initial commit..."
       git.init 

data/lib/webbynode/io.rb

@@ -70,6 +70,7 @@ module Webbynode
     end
     
     def mkdir(path)
+      raise "Tried to create real directory: #{path}" if $testing
       # TODO: raise "Tried to create real folder: #{path}" if $testing
       FileUtils.mkdir_p(path)
     end
@@ -190,6 +191,7 @@ module Webbynode
     end
     
     def create_file(file_name, contents, executable=nil)
+      raise "Tried to create real file: #{file_name}" if $testing and !$testing_io
       File.open(file_name, "w") do |file|
         file.write(contents)
       end

data/lib/webbynode/push_and.rb

@@ -16,5 +16,9 @@ module Webbynode
     def remote_db_name
       parse_remote_app_name.gsub(/[-._]/, "")      
     end
+    
+    def create!(app_name, dns_entry)
+      io.create_file(".pushand", "#! /bin/bash\nphd $0 #{app_name} #{dns_entry}\n", true)
+    end
   end
 end

data/lib/webbynode/remote_executor.rb

@@ -16,6 +16,18 @@ module Webbynode
       ssh.execute "mkdir -p #{folder}"
     end
     
+    def version(v)
+      v ? "-v=#{v} " : ""
+    end
+    
+    def gem_installed?(gem_name, version=nil)
+      exec("gem list -i #{version(version)}#{gem_name}") == 'true'
+    end
+    
+    def install_gem(gem_name, version=nil)
+      exec("sudo gem install #{version(version)}#{gem_name} > /dev/null 2>1; echo $?") == '0'
+    end
+
     def remote_home
       exec('pwd').strip
     end

data/lib/webbynode/ssh.rb

@@ -68,14 +68,14 @@ module Webbynode
         end
 
         ch.env "PATH", "/usr/bin:/usr/local/bin:/opt/ruby-enterprise/bin"
-        ch.exec "cd #{app_name}; rails console production" do |ch, success|
+        ch.exec "cd #{app_name} && rails console production" do |ch, success|
           abort "Could not connect to rails console" unless success
 
           ch.on_data do |ch, data|
             next if data.chomp == input.chomp || data.chomp == ''
             if data =~ /^irb(.*)[\>|\*] /
               prompt = ''
-              data.each_with_index do |s, i|
+              data.chars.each_with_index do |s, i|
                 if s =~ /^irb(.*)[\>|\*] /
                   prompt = s
                 else
@@ -108,6 +108,7 @@ module Webbynode
         puts ""
         puts "Console done."
       rescue Exception => e
+        puts "Error: #{$!.message}"
       end
     end
     

data/lib/webbynode/taps.rb

@@ -1,5 +1,6 @@
 require 'taps/operation'
 require 'taps/cli'
+require 'cgi'
 
 module Webbynode
   class Taps
@@ -17,6 +18,22 @@ module Webbynode
       @remote_executor = remote_executor
     end
     
+    def ensure_gems!
+      check_and_install ['taps', '0.3.23'], 'mysql'
+    end
+    
+    def check_and_install(*gems)
+      gems.each do |g| 
+        if g.is_a?(Array)
+          gemd = *g
+        else
+          gemd = [g]
+        end
+        
+        remote_executor.install_gem *gemd unless remote_executor.gem_installed?(*gemd)
+      end
+    end
+    
     def start
       @user = io.random_password
       @password = io.random_password
@@ -61,14 +78,24 @@ module Webbynode
     def execute(action, options)
       raise "Taps server was not started" unless user
       
-      local_url = "mysql://#{options[:user]}:#{options[:password]}@localhost/#{options[:database]}"
-      remote_url = "http://#{user}:#{password}@#{options[:remote_ip]}:5000"
-      
-      io.log "Running taps #{action}"
+      local_url = "mysql://#{options[:user]}:#{CGI.escape(options[:password])}@localhost/#{options[:database]}"
+      remote_url = "http://#{user}:#{CGI.escape(password)}@#{options[:remote_ip]}:5000"
       
       ::Taps::Cli.new([]).clientxfer(action.to_sym, 
         :database_url => local_url, 
         :remote_url => remote_url)
     end
   end
+end
+
+class TapsError < StandardError; end
+
+class Taps::Config
+  def self.puts(error)
+    @error = error
+  end
+  
+  def self.exit(num)
+    raise TapsError, @error
+  end
 end

data/lib/webbynode.rb

@@ -77,7 +77,7 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'database')
 require File.join(File.dirname(__FILE__), 'webbynode', 'application')
 
 module Webbynode
-  VERSION = '1.0.5.beta5'
+  VERSION = '1.0.5.beta6'
 end
 
 class Array
@@ -93,6 +93,14 @@ class Array
   end
 end
 
+unless Object.respond_to?(:blank?)
+  class Object
+    def blank?
+      respond_to?(:empty?) ? empty? : !self
+    end
+  end
+end
+
 class Net::HTTP
   alias_method :old_initialize, :initialize
   def initialize(*args)

data/spec/webbynode/commands/change_dns_spec.rb

@@ -6,25 +6,37 @@ describe Webbynode::Commands::ChangeDns do
   let(:io)  { double("io").as_null_object }
   let(:api) { double("api").as_null_object }
   let(:cmd) { Webbynode::Commands::ChangeDns.new("the.newdns.com") }
-  
+  let(:pushand) { stub.as_null_object }
 
   before(:each) do
     FakeWeb.clean_registry
     cmd.should_receive(:io).any_number_of_times.and_return(io)
     cmd.should_receive(:git).any_number_of_times.and_return(git)
     cmd.should_receive(:api).any_number_of_times.and_return(api)
-    
+    cmd.stub(:pushand).and_return(pushand)
   end
 
   it "should change pushand" do
     io.should_receive(:app_name).and_return("myapp")
-    io.should_receive(:create_file).with(".pushand", "#! /bin/bash\nphd $0 myapp the.newdns.com\n", true)
+    pushand.should_receive(:create!).with("myapp", "the.newdns.com")
     git.should_receive(:parse_remote_ip).and_return("1.2.3.4")
     api.should_receive(:create_record).with("the.newdns.com", "1.2.3.4")
     
     cmd.run
   end
   
+  it "gives an error message when zone exists, but is inactive" do
+    git.should_receive(:parse_remote_ip).and_return("1.2.3.4")
+    api.should_receive(:create_record).with("the.newdns.com", "1.2.3.4").and_raise(Webbynode::ApiClient::InactiveZone.new( "the.newdns.com"))
+
+    io.should_receive(:log).with("Changing DNS to the.newdns.com...", :quiet_start)
+    io.should_receive(:log).with("Creating DNS entry for the.newdns.com...")
+    io.should_receive(:log).with("Domain the.newdns.com already setup on Webbynode DNS, but it's inactive.")
+    io.should_receive(:log).with("Please reactivate it and try again.")
+    
+    cmd.run
+  end
+  
   it "should give an error message if there are git changes pending" do
     git.should_receive(:clean?).and_return(false)
     

data/spec/webbynode/commands/console_spec.rb

@@ -6,6 +6,7 @@ describe Webbynode::Commands::Console do
   let(:re)      { double("RemoteExecutor").as_null_object }
   let(:git)     { double("Git").as_null_object }
   let(:server)  { double("Server").as_null_object }
+  let(:pushand) { stub.as_null_object }
   
   subject do
     Webbynode::Commands::Console.new.tap do |cmd|
@@ -13,6 +14,7 @@ describe Webbynode::Commands::Console do
       cmd.stub!(:remote_executor).and_return(re)
       cmd.stub!(:server).and_return(server)
       cmd.stub!(:git).and_return(git)
+      cmd.stub(:pushand).and_return(pushand)
     end  
   end
   

data/spec/webbynode/commands/database_spec.rb

@@ -2,10 +2,11 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'spec_helper')
 
 describe Webbynode::Commands::Database do
-  let(:io)  { double("io").as_null_object }
-  let(:re)  { double("re").as_null_object }
-  let(:git) { double("git").as_null_object }
-  let(:pa)  { double("pushand").as_null_object }
+  let(:io)   { double("io").as_null_object }
+  let(:re)   { double("re").as_null_object }
+  let(:git)  { double("git").as_null_object }
+  let(:pa)   { double("pushand").as_null_object }
+  let(:taps) { double("taps").as_null_object }
   
   def prepare(*params)
     Webbynode::Commands::Database.new(*params).tap do |a|
@@ -16,9 +17,86 @@ describe Webbynode::Commands::Database do
     end
   end
   
+  describe '#config' do
+    subject { prepare "config" }
+
+    it 'asks for credentials again, even if already provided' do
+      io.should_receive(:load_setting).with("database_name").and_return("dbname")
+      io.should_receive(:load_setting).with("database_user").and_return("username")
+      io.should_receive(:load_setting).with("database_password").and_return("dbpassword")
+      
+      io.should_receive(:db_name).any_number_of_times.and_return("myapp")
+      
+      subject.should_receive(:ask).with("Database name [dbname]: ").and_return("")
+      subject.should_receive(:ask).with("    User name [username]: ").and_return("")
+      subject.should_receive(:ask).with("     Password []: ").and_return("")
+      subject.should_receive(:ask).with("Save password (y/n)? ").and_return("y")
+
+      subject.execute
+    end
+  end
+  
   describe '#pull' do
     subject { prepare "pull" }
     
+    it "installs taps and mysql when none installed" do
+      Webbynode::Taps.should_receive(:new).and_return(taps)
+
+      subject.stub(:ask_db_credentials)
+      subject.stub(:db).and_return({ :name => 'db_name' })
+      subject.stub(:sleep)
+      taps.stub(:start)
+      taps.should_receive(:ensure_gems!)
+      
+      subject.execute
+    end
+    
+    context 'db failures' do
+      def prepare_with_error(error)
+        subject.stub(:ask_db_credentials)
+        subject.stub(:db).and_return({ :name => 'db_name' })
+        subject.stub(:sleep)
+
+        Webbynode::Taps.should_receive(:new).and_return(taps)
+
+        pa.should_receive(:remote_db_name).and_return('db_name')
+        re.should_receive(:retrieve_db_password).and_return('password')
+        git.should_receive(:parse_remote_ip).and_return('1.2.3.4')
+
+        taps.should_receive(:pull).and_raise(TapsError.new(error))
+      end
+      
+      it "shows an user friendly error message cannot connect to local database" do
+        prepare_with_error "Failed to connect to database:
+          Sequel::DatabaseConnectionError -> Mysql::Error: Access denied for user 'root'@'localhost' (using password: YES)"
+        io.should_receive(:log).with("ERROR: Invalid MySQL credentials for your local database (Access denied for user 'root'@'localhost' (using password: YES))")
+
+        subject.execute
+      end
+      
+      it "shows an user friendly error for URI errors" do
+        prepare_with_error "Failed to connect to database:
+          URI::InvalidURIError -> the scheme mysql does not accept registry part: root:P@ssw0rd@localhost (or bad hostname?)."
+        io.should_receive(:log).with("ERROR: Unexpected error - the scheme mysql does not accept registry part: root:P@ssw0rd@localhost (or bad hostname?).")
+
+        subject.execute
+      end
+        
+      it "shows an user friendly error message when a MySQL database doesn't exist" do
+        prepare_with_error "Failed to connect to database:\n          Sequel::DatabaseConnectionError -> Mysql::Error: Unknown database 'r3app'"
+        io.should_receive(:log).with("ERROR: Unknown database r3app. Create the local database and try again.")
+
+        subject.execute
+      end
+      
+      it "shows an user friendly error message when an adapter is not present" do
+        prepare_with_error "Failed to connect to database:\n        Sequel::AdapterNotFound -> LoadError: no such file to load -- mysql"
+        io.should_receive(:log).with("ERROR: Missing database adapter. You need to install mysql gem to handle your database.")
+
+        subject.execute
+      end
+    end
+    
     it "asks the local database credentials and name" do
       io.should_receive(:load_setting).with("database_name").and_return(nil)
       io.should_receive(:load_setting).with("database_password").and_return(nil)