webbynode 1.0.5.beta2 → 1.0.5.beta3

data/Gemfile

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

data/Gemfile.lock

@@ -31,13 +31,17 @@ GEM
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
+    mime-types (1.16)
     net-ssh (2.1.0)
     open_gem (1.4.2)
       launchy (~> 0.3.5)
+    rack (1.2.1)
     rainbow (1.1.1)
     rake (0.8.7)
     rb-fsevent (0.4.0)
     rcov (0.9.9)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -48,6 +52,18 @@ GEM
     rspec-mocks (2.5.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
+    sequel (3.20.0)
+    sinatra (1.0)
+      rack (>= 1.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    taps (0.3.19)
+      rack (>= 1.0.1)
+      rest-client (< 1.7.0, >= 1.4.0)
+      sequel (~> 3.20.0)
+      sinatra (~> 1.0.0)
+      sqlite3-ruby (~> 1.2)
     thor (0.14.6)
 
 PLATFORMS
@@ -71,3 +87,4 @@ DEPENDENCIES
   rb-fsevent
   rcov
   rspec
+  taps

data/Manifest

@@ -22,6 +22,7 @@ lib/templates/backup
 lib/templates/gitignore
 lib/templates/help
 lib/webbynode.rb
+lib/webbynode/action_command.rb
 lib/webbynode/api_client.rb
 lib/webbynode/application.rb
 lib/webbynode/attribute_accessors.rb
@@ -36,6 +37,7 @@ lib/webbynode/commands/authorize_root.rb
 lib/webbynode/commands/change_dns.rb
 lib/webbynode/commands/config.rb
 lib/webbynode/commands/console.rb
+lib/webbynode/commands/database.rb
 lib/webbynode/commands/delete.rb
 lib/webbynode/commands/guides.rb
 lib/webbynode/commands/help.rb
@@ -46,6 +48,7 @@ lib/webbynode/commands/push.rb
 lib/webbynode/commands/remote.rb
 lib/webbynode/commands/restart.rb
 lib/webbynode/commands/settings.rb
+lib/webbynode/commands/ssh.rb
 lib/webbynode/commands/start.rb
 lib/webbynode/commands/stop.rb
 lib/webbynode/commands/tasks.rb
@@ -74,6 +77,7 @@ lib/webbynode/remote_executor.rb
 lib/webbynode/server.rb
 lib/webbynode/ssh.rb
 lib/webbynode/ssh_keys.rb
+lib/webbynode/taps.rb
 lib/webbynode/trial.rb
 lib/webbynode/updater.rb
 spec/fixtures/aliases
@@ -116,6 +120,7 @@ spec/webbynode/commands/authorize_root_spec.rb
 spec/webbynode/commands/change_dns_spec.rb
 spec/webbynode/commands/config_spec.rb
 spec/webbynode/commands/console_spec.rb
+spec/webbynode/commands/database_spec.rb
 spec/webbynode/commands/delete_spec.rb
 spec/webbynode/commands/guides_spec.rb
 spec/webbynode/commands/help_spec.rb
@@ -125,6 +130,7 @@ spec/webbynode/commands/open_spec.rb
 spec/webbynode/commands/push_spec.rb
 spec/webbynode/commands/remote_spec.rb
 spec/webbynode/commands/settings_spec.rb
+spec/webbynode/commands/ssh_spec.rb
 spec/webbynode/commands/tasks_spec.rb
 spec/webbynode/commands/user_spec.rb
 spec/webbynode/commands/version_spec.rb
@@ -148,5 +154,5 @@ spec/webbynode/push_and_spec.rb
 spec/webbynode/remote_executor_spec.rb
 spec/webbynode/server_spec.rb
 spec/webbynode/ssh_spec.rb
+spec/webbynode/taps_spec.rb
 spec/webbynode/trial_spec.rb
-webbynode.gemspec

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 require 'echoe'  
   
-Echoe.new('webbynode', '1.0.5.beta2') do |p|  
+Echoe.new('webbynode', '1.0.5.beta3') do |p|  
   p.description     = "Webbynode Deployment Gem"  
   p.url             = "http://webbynode.com"  
   p.author          = "Felipe Coury"
@@ -13,6 +13,7 @@ Echoe.new('webbynode', '1.0.5.beta2') do |p|
   p.dependencies = [ 
     ['bundler', '>=0.9.26'],
     ['net-ssh', '=2.1.0'],
+    ['taps', '~>0.3.19'],
     ['highline', '>=1.5.2'],
     ['httparty', '>=0.4.5'],
     ['launchy',  '>=0.3.7'],

data/lib/webbynode/action_command.rb

@@ -0,0 +1,22 @@
+module Webbynode
+  class ActionCommand < Webbynode::Command
+    attr_reader :action
+    
+    def self.allowed_actions(actions)
+      self.parameter :action, String, actions.join(", "), 
+        :validate => { :in => actions },
+        :required => false
+    end
+    
+    def execute
+      @action = param(:action) || "default"
+      send(action)
+    end
+    
+    private
+    
+    def default
+      raise "No default method for #{self.class.name}"
+    end
+  end
+end

data/lib/webbynode/api_client.rb

@@ -84,7 +84,7 @@ module Webbynode
         email = overwrite[:email] if overwrite.is_a?(Hash) and overwrite[:email]
         token = overwrite[:token] if overwrite.is_a?(Hash) and overwrite[:token]
         
-        puts io.read_from_template("api_token") unless email and token
+        io.log io.read_from_template("api_token") unless email and token
 
         email ||= ask("Login email: ")
         token ||= ask("API token:   ")

data/lib/webbynode/application.rb

@@ -7,6 +7,12 @@ module Webbynode
     def initialize(*args)
       args = ["help", "commands"] unless args.any?
       
+      if args.first.include?(":")
+        arg = args.shift
+        args.unshift arg.split(":")[1]
+        args.unshift arg.split(":")[0]
+      end
+      
       @command = args.shift
       @params = args
     end

data/lib/webbynode/commands/accounts.rb

@@ -2,19 +2,21 @@ module Webbynode::Commands
   class Accounts < Webbynode::Command
     summary "Manages multiple Webbynode accounts"
     add_alias "account"
+    add_alias "acc"
     
-    parameter :action, String, "use, new, save, delete or list.", 
-      :validate => { :in => ["use", "new", "save", "delete", "list"] },
+    parameter :action, String, "use, new, save, rename, delete or list.", 
+      :validate => { :in => ["use", "new", "save", "rename", "delete", "list"] },
       :default  => "list",
       :required => false
     parameter :name, String, "account name", :required => false
+    parameter :new_name, String, "new account name", :required => false
     
     Prefix = "#{Webbynode::Io.home_dir}/.webbynode"
     
     attr_accessor :action
 
     def execute
-      @action = param(:action) || "default"
+      @action = param(:action) || "list"
       send(action)
     end
     
@@ -22,7 +24,7 @@ module Webbynode::Commands
     
     def missing_target?
       unless io.file_exists?(target)
-        io.log "Account alias '#{param(:name)}' not found. Use 'wn account list' for a full list."
+        io.log "Account alias #{param(:name).color(:yellow)} not found. Use #{"wn account list".color(:white).bright} for a full list."
         return true
       end      
     end
@@ -33,7 +35,7 @@ module Webbynode::Commands
     
     def default
       credentials = api.credentials
-      io.log "Current account: #{credentials["email"]}"
+      io.log "Current account: #{credentials["email"].color(:yellow)}"
     end
     
     def list
@@ -44,9 +46,11 @@ module Webbynode::Commands
         return
       end
       
+      current = api.credentials["email"]
       files.each do |f|
         if f =~ /\.webbynode_(.*)/
-          io.log $1
+          mark = io.file_matches(f, /email=#{current}/) ? "* " : "  "
+          io.log "#{mark.color(:yellow)}#{$1.color(:white).bright}"
         end
       end
     end
@@ -63,6 +67,7 @@ module Webbynode::Commands
     def use
       return if missing_target?
       io.copy_file target, "#{Prefix}"
+      io.log "Successfully switched to account alias #{param(:name).color(:yellow)}."
     end
     
     def new
@@ -73,5 +78,17 @@ module Webbynode::Commands
       return if missing_target?
       io.delete_file target
     end
+    
+    def rename
+      return if missing_target?
+
+      if io.file_exists?("#{Prefix}_#{param(:new_name)}")
+        io.log "Account alias #{param(:new_name).color(:yellow)} already exists, use #{"wn account delete".color(:white).bright} to remove it first."
+        return
+      end
+      
+      io.rename_file "#{Prefix}_#{param(:name)}", "#{Prefix}_#{param(:new_name)}"
+      io.log "Account alias #{param(:name).color(:yellow)} successfully renamed to #{param(:new_name).color(:yellow)}."
+    end
   end
 end

data/lib/webbynode/commands/add_backup.rb

@@ -8,7 +8,7 @@ module Webbynode::Commands
       secret = io.general_settings['aws_secret']
       
       unless key and secret
-        puts io.read_from_template("backup")
+        io.log io.read_from_template("backup")
         
         key    = ask("AWS key: ")
         secret = ask("AWS secret: ") unless key.blank?

data/lib/webbynode/commands/database.rb

@@ -0,0 +1,93 @@
+module Webbynode::Commands
+  class Database < Webbynode::ActionCommand
+    summary "Manages your application database"
+
+    add_alias "db"
+    allowed_actions %w(pull push)
+    
+    option :debug, "Show server communication steps"
+    
+    requires_initialization!
+    attr_reader :db
+    
+    def pull
+      go :pull
+    end
+    
+    def push
+      go :push
+    end
+    
+    def go(action)
+      ask_db_credentials
+      
+      io.log "#{action.to_s.capitalize}ing remote data to database #{db[:name]}"
+      
+      db_name  = pushand.remote_db_name
+      password = remote_executor.retrieve_db_password
+      ip       = git.parse_remote_ip
+      
+      if option(:debug)
+        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 "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)
+      ensure
+        io.log "Stopping taps server..."
+        taps.finish
+      end    
+    end
+    
+    def query(question, default)
+      answer = ask("#{question} [#{default}]: ")
+      answer = default if answer.blank?
+      answer
+    end
+    
+    def retrieve_db_credentials
+      @db = {
+        :name => io.load_setting("database_name"),
+        :user => io.load_setting("database_user"),
+        :password => io.load_setting("database_password")
+      }
+    end
+    
+    def ask_db_credentials
+      retrieve_db_credentials
+      
+      unless db[:name]
+        db[:name] = query("Database name", io.db_name)
+        db[:user] = query("    User name", io.db_name)
+      end
+      
+      save_password = false
+      unless db[:password]
+        db[:password] = query("     Password", "")
+        save_password = ask("Save password (y/n)? ").downcase == 'y'
+      end
+      
+      save_db_credentials(save_password)
+    end
+    
+    def save_db_credentials(save_password)
+      io.add_setting "database_name", db[:name]
+      io.add_setting "database_user", db[:user]
+      
+      if save_password
+        io.add_setting "database_password", db[:password]
+      end
+    end
+  end
+end

data/lib/webbynode/commands/ssh.rb

@@ -0,0 +1,11 @@
+module Webbynode::Commands
+  class Ssh < Webbynode::Command
+    summary "Log into your Webby via SSH"
+
+    requires_initialization!
+    
+    def execute
+      server.ssh
+    end
+  end
+end

data/lib/webbynode/git.rb

@@ -24,7 +24,7 @@ module Webbynode
     end
     
     def clean?
-      io.exec("git status") =~ /working directory clean/
+      io.exec("git status") =~ /nothing to commit/
     end
     
     def delete_file(file)

data/lib/webbynode/io.rb

@@ -14,6 +14,13 @@ module Webbynode
       Config::CONFIG["host_os"] =~ /mswin|mingw/
     end
     
+    def random_password(len=10)
+      chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
+      newpass = ""
+      1.upto(len) { |i| newpass << chars[rand(chars.size-1)] }
+      return newpass
+    end
+          
     def list_files(dir)
       Dir.glob(dir)
     end
@@ -50,10 +57,18 @@ module Webbynode
       File.open(file, 'w') { |f| f.write(contents) }
     end
     
+    def file_matches(file, regexp)
+      File.read(file) =~ regexp
+    end
+    
     def app_name
       Dir.pwd.split("/").last.gsub(/[\.| ]/, "_")
     end
     
+    def db_name
+      app_name.gsub(/[-._]/, "")      
+    end
+    
     def mkdir(path)
       # TODO: raise "Tried to create real folder: #{path}" if $testing
       FileUtils.mkdir_p(path)
@@ -73,6 +88,11 @@ module Webbynode
       [$? == 0, result]
     end
     
+    def execute(s)
+      Kernel.exec s
+      $?
+    end
+    
     def directory?(s)
       File.directory?(s)
     end
@@ -184,6 +204,10 @@ module Webbynode
       File.delete(file_name)
     end
     
+    def rename_file(old_name, new_name)
+      File.rename(old_name, new_name)
+    end
+    
     def templates_path
       TemplatesPath
     end

data/lib/webbynode/push_and.rb

@@ -12,5 +12,9 @@ module Webbynode
     def parse_remote_app_name
       io.read_file(".pushand")[/^phd \$0 ([^ ]+)/, 1]
     end
+
+    def remote_db_name
+      parse_remote_app_name.gsub(/[-._]/, "")      
+    end
   end
 end

data/lib/webbynode/remote_executor.rb

@@ -20,6 +20,11 @@ module Webbynode
       exec('pwd').strip
     end
     
+    def retrieve_db_password
+      password = exec %q(echo `cat /var/webbynode/templates/rails/database.yml | grep password: | tail -1 | cut -d ":" -f 2`)
+      password.strip
+    end
+    
     def exec(cmd, echo=false, exit_code=false)
       begin
         ssh.execute(cmd, echo, exit_code)

data/lib/webbynode/server.rb

@@ -16,6 +16,10 @@ module Webbynode
     def io
       @io ||= Webbynode::Io.new
     end
+    
+    def ssh
+      Kernel.exec "ssh -p #{port} git@#{ip}"
+    end
    
     def remote_executor
       @remote_executor ||= Webbynode::RemoteExecutor.new(ip, user, port)

data/lib/webbynode/taps.rb

@@ -0,0 +1,74 @@
+require 'taps/operation'
+require 'taps/cli'
+
+module Webbynode
+  class Taps
+    attr_reader :database, :database_password
+    attr_reader :io, :remote_executor
+    attr_reader :user, :password
+    attr_reader :pid
+
+    attr_accessor :debug
+
+    def initialize(database, database_password, io, remote_executor)
+      @database = database
+      @database_password = database_password
+      @io = io
+      @remote_executor = remote_executor
+    end
+    
+    def start
+      @user = io.random_password
+      @password = io.random_password
+      
+      command = "bash -c 'nohup taps server mysql://#{database}:#{database_password}@localhost/#{database} #{@user} #{@password} > /dev/null 2>&1 &\necho $!'"
+      
+      io.log "Executing: #{command}" if debug
+      
+      result = remote_executor.exec(command)
+      result.strip! if result
+      
+      io.log "Result: #{result}" if debug
+      io.log "" if debug
+      
+      raise "Could not start taps on remote server" unless result =~ /^[0-9]+$/
+
+      @pid = result
+    end
+    
+    def pull(options)
+      execute "pull", options
+    end
+    
+    def push(options)
+      execute "push", options
+    end
+    
+    def finish
+      raise "Taps server was not started" unless user
+      
+      command = "kill -9 #{pid}"
+      
+      io.log "Executing: #{command}" if debug
+
+      result = remote_executor.exec command
+      
+      io.log "Result: #{result}\n" if debug
+    end
+    
+    private
+    
+    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}"
+      
+      ::Taps::Cli.new([]).clientxfer(action.to_sym, 
+        :database_url => local_url, 
+        :remote_url => remote_url)
+    end
+  end
+end

data/lib/webbynode.rb

@@ -24,6 +24,7 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'server')
 require File.join(File.dirname(__FILE__), 'webbynode', 'push_and')
 require File.join(File.dirname(__FILE__), 'webbynode', 'gemfile')
 require File.join(File.dirname(__FILE__), 'webbynode', 'command')
+require File.join(File.dirname(__FILE__), 'webbynode', 'action_command')
 require File.join(File.dirname(__FILE__), 'webbynode', 'option')
 require File.join(File.dirname(__FILE__), 'webbynode', 'parameter')
 require File.join(File.dirname(__FILE__), 'webbynode', 'api_client')
@@ -31,6 +32,7 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'remote_executor')
 require File.join(File.dirname(__FILE__), 'webbynode', 'notify')
 require File.join(File.dirname(__FILE__), 'webbynode', 'updater')
 require File.join(File.dirname(__FILE__), 'webbynode', 'trial')
+require File.join(File.dirname(__FILE__), 'webbynode', 'taps')
 require File.join(File.dirname(__FILE__), 'webbynode', 'properties')
 require File.join(File.dirname(__FILE__), 'webbynode', 'attribute_accessors')
 require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'engine')
@@ -69,10 +71,12 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'authorize_ro
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'console')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'logs')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'guides')
+require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'ssh')
+require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'database')
 require File.join(File.dirname(__FILE__), 'webbynode', 'application')
 
 module Webbynode
-  VERSION = '1.0.5.beta2'
+  VERSION = '1.0.5.beta3'
 end
 
 class Array

data/spec/webbynode/api_client_spec.rb

@@ -165,6 +165,8 @@ describe Webbynode::ApiClient do
         api.should_receive(:ask).with("Login email: ").once.ordered.and_return("login@email.com")
         api.should_receive(:ask).with("API token:   ").once.ordered.and_return("apitoken")
         
+        io.stub(:log)
+
         creds = api.init_credentials(true)
         creds[:email].should == "login@email.com"
         creds[:token].should == "apitoken"
@@ -203,6 +205,8 @@ describe Webbynode::ApiClient do
         api.should_receive(:ask).with("Login email: ").once.ordered.and_return("login@email.com")
         api.should_receive(:ask).with("API token:   ").once.ordered.and_return("apitoken")
         
+        io.stub(:log)
+
         api.init_credentials
       end
 
@@ -219,6 +223,8 @@ describe Webbynode::ApiClient do
         
         api.should_receive(:ask).with("Login email: ").once.ordered.and_return("login@email.com")
         api.should_receive(:ask).with("API token:   ").once.ordered.and_return("apitoken")
+
+        io.stub(:log)
         
         lambda { api.init_credentials }.should raise_error(Webbynode::ApiClient::Unauthorized, "You have provided the wrong credentials")
       end