webbynode 1.0.4.3 → 1.0.5.beta2

data/Gemfile

@@ -4,6 +4,7 @@ gem 'httparty'
 gem 'domainatrix'
 gem 'net-ssh'
 gem 'highline'
+gem 'rainbow'
 
 group :development do
   gem 'rspec'
@@ -17,4 +18,5 @@ group :development do
   gem 'fakeweb'
   gem 'echoe'
   gem 'rcov'
+	gem 'rb-fsevent'
 end

data/Gemfile.lock

@@ -34,7 +34,9 @@ GEM
     net-ssh (2.1.0)
     open_gem (1.4.2)
       launchy (~> 0.3.5)
+    rainbow (1.1.1)
     rake (0.8.7)
+    rb-fsevent (0.4.0)
     rcov (0.9.9)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -65,5 +67,7 @@ DEPENDENCIES
   highline
   httparty
   net-ssh
+  rainbow
+  rb-fsevent
   rcov
   rspec

data/Guardfile

@@ -1,5 +1,5 @@
 guard 'rspec' do
   watch(%r{spec/(.*)_spec.rb})
-  watch(%r{lib/(.*)\.rb})      { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{lib/(.*)\.rb})      { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb') { "spec" }
 end

data/Manifest

@@ -26,6 +26,7 @@ lib/webbynode/api_client.rb
 lib/webbynode/application.rb
 lib/webbynode/attribute_accessors.rb
 lib/webbynode/command.rb
+lib/webbynode/commands/accounts.rb
 lib/webbynode/commands/add_backup.rb
 lib/webbynode/commands/add_key.rb
 lib/webbynode/commands/addons.rb
@@ -36,6 +37,7 @@ lib/webbynode/commands/change_dns.rb
 lib/webbynode/commands/config.rb
 lib/webbynode/commands/console.rb
 lib/webbynode/commands/delete.rb
+lib/webbynode/commands/guides.rb
 lib/webbynode/commands/help.rb
 lib/webbynode/commands/init.rb
 lib/webbynode/commands/logs.rb
@@ -99,12 +101,12 @@ spec/fixtures/git/status/clean
 spec/fixtures/git/status/dirty
 spec/fixtures/nodejs/server.js
 spec/fixtures/pushand
-spec/fixtures/settings.py
 spec/fixtures/trial/user_add
 spec/spec_helper.rb
 spec/webbynode/api_client_spec.rb
 spec/webbynode/application_spec.rb
 spec/webbynode/command_spec.rb
+spec/webbynode/commands/accounts_spec.rb
 spec/webbynode/commands/add_backup_spec.rb
 spec/webbynode/commands/add_key_spec.rb
 spec/webbynode/commands/addons_spec.rb
@@ -115,6 +117,7 @@ spec/webbynode/commands/change_dns_spec.rb
 spec/webbynode/commands/config_spec.rb
 spec/webbynode/commands/console_spec.rb
 spec/webbynode/commands/delete_spec.rb
+spec/webbynode/commands/guides_spec.rb
 spec/webbynode/commands/help_spec.rb
 spec/webbynode/commands/init_spec.rb
 spec/webbynode/commands/logs_spec.rb
@@ -146,3 +149,4 @@ spec/webbynode/remote_executor_spec.rb
 spec/webbynode/server_spec.rb
 spec/webbynode/ssh_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.4.3') do |p|  
+Echoe.new('webbynode', '1.0.5.beta2') do |p|  
   p.description     = "Webbynode Deployment Gem"  
   p.url             = "http://webbynode.com"  
   p.author          = "Felipe Coury"
@@ -17,6 +17,7 @@ Echoe.new('webbynode', '1.0.4.3') do |p|
     ['httparty', '>=0.4.5'],
     ['launchy',  '>=0.3.7'],
     ['domainatrix','>=0.0.7'],
+    ['rainbow','1.1.1'],
   ]
   # p.dependencies = [
   #   ['activeresource','>= 2.3.4'],
@@ -37,6 +38,10 @@ the comfort of your command line.
 Please read our guide for a quickstart:
 http://guides.webbynode.com/articles/rapidapps/
 
+For more information use the commands:
+wn help
+wn guides
+
 "
 end
 

data/lib/webbynode.rb

@@ -7,7 +7,15 @@ require 'domainatrix'
 require 'net/ssh'
 require 'highline/import'
 require 'readline'
-require 'pp'
+require 'rainbow'
+
+begin
+  require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /mswin/
+rescue LoadError
+  puts "Hint: if you want to make your output better in windows, install the win32console gem:"
+  puts "      gem install win32console"
+  puts ""
+end
 
 require File.join(File.dirname(__FILE__), 'webbynode', 'io')
 require File.join(File.dirname(__FILE__), 'webbynode', 'git')
@@ -35,6 +43,7 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'nodejs')
 require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'wsgi')
 require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'html')
 require File.join(File.dirname(__FILE__), 'webbynode', 'engines', 'all')
+require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'accounts')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'apps')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'addons')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'init')
@@ -59,10 +68,11 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'settings')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'authorize_root')
 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', 'application')
 
 module Webbynode
-  VERSION = '1.0.4.3'
+  VERSION = '1.0.5.beta2'
 end
 
 class Array
@@ -76,4 +86,13 @@ class Array
 
     "#{array.join(", ")} #{last_join} #{last}"
   end
+end
+
+class Net::HTTP
+  alias_method :old_initialize, :initialize
+  def initialize(*args)
+    old_initialize(*args)
+    @ssl_context = OpenSSL::SSL::SSLContext.new
+    @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  end
 end

data/lib/webbynode/command.rb

@@ -280,6 +280,32 @@ module Webbynode
     end
     
     private
+    
+    def spinner(&code)
+      chars = %w{ | / - \\ }
+
+      result = nil
+      t = Thread.new { 
+        result = code.call
+      }
+      while t.alive?
+        print chars[0]
+        STDOUT.flush
+
+        sleep 0.1
+
+        print "\b"
+        STDOUT.flush
+
+        chars.push chars.shift
+      end
+
+      print " \b"
+      STDOUT.flush
+
+      t.join
+      result
+    end
 
     def parse_args(args)
       settings[:options].each { |o| o.reset! }

data/lib/webbynode/commands/accounts.rb

@@ -0,0 +1,77 @@
+module Webbynode::Commands
+  class Accounts < Webbynode::Command
+    summary "Manages multiple Webbynode accounts"
+    add_alias "account"
+    
+    parameter :action, String, "use, new, save, delete or list.", 
+      :validate => { :in => ["use", "new", "save", "delete", "list"] },
+      :default  => "list",
+      :required => false
+    parameter :name, String, "account name", :required => false
+    
+    Prefix = "#{Webbynode::Io.home_dir}/.webbynode"
+    
+    attr_accessor :action
+
+    def execute
+      @action = param(:action) || "default"
+      send(action)
+    end
+    
+    private
+    
+    def missing_target?
+      unless io.file_exists?(target)
+        io.log "Account alias '#{param(:name)}' not found. Use 'wn account list' for a full list."
+        return true
+      end      
+    end
+    
+    def target
+      @target ||= "#{Prefix}_#{param(:name)}"
+    end
+    
+    def default
+      credentials = api.credentials
+      io.log "Current account: #{credentials["email"]}"
+    end
+    
+    def list
+      files = io.list_files "#{Prefix}_*"
+      
+      unless files.any?
+        io.log "No accounts found. Use 'wn accounts save' to save current account with an alias."
+        return
+      end
+      
+      files.each do |f|
+        if f =~ /\.webbynode_(.*)/
+          io.log $1
+        end
+      end
+    end
+    
+    def save
+      if io.file_exists?(target) and ask("Do you want to overwrite saved account name (y/n)? ").downcase != "y"
+        io.log "Save aborted."
+        return
+      end
+        
+      io.copy_file "#{Prefix}", target
+    end
+    
+    def use
+      return if missing_target?
+      io.copy_file target, "#{Prefix}"
+    end
+    
+    def new
+      api.init_credentials true
+    end
+    
+    def delete
+      return if missing_target?
+      io.delete_file target
+    end
+  end
+end

data/lib/webbynode/commands/guides.rb

@@ -0,0 +1,11 @@
+require 'launchy'
+
+module Webbynode::Commands
+  class Guides < Webbynode::Command
+    summary "Opens the Rapp Guides in your browser"
+   
+    def execute
+      Launchy.open "http://wbno.de/rapp"
+    end
+  end
+end

data/lib/webbynode/commands/help.rb

@@ -5,7 +5,7 @@ module Webbynode::Commands
     
     def execute
       if param(:command) == "commands"
-        puts "usage: webbynode COMMAND"
+        puts "usage: #{"webbynode".color(:white).bright} #{"COMMAND".color(:green)}"
         puts
         puts "Available commands:"
         dir = File.join(File.expand_path(File.dirname(__FILE__)), "/*.rb")
@@ -13,10 +13,10 @@ module Webbynode::Commands
           command = file.split("/").last
           command.gsub!(/\.rb/, "")
           
-          puts "    #{command.ljust(10)} #{Webbynode::Command.class_for(command).setting(:summary)}"
+          puts "    #{command.ljust(15).color(:green)} #{Webbynode::Command.class_for(command).setting(:summary)}"
         end
         puts 
-        puts "Try 'webbynode help COMMAND' for more information."
+        puts "Try '#{"webbynode help".color(:white).bright} #{"COMMAND".color(:green)}' for more information."
       else
         kls = Help.for(param(:command))
         if kls

data/lib/webbynode/commands/init.rb

@@ -14,7 +14,7 @@ module Webbynode::Commands
         return
       end
       
-      io.log "Webbynode Rapp - http://rapp.webbynode.com"
+      io.log "#{"Webbynode Rapp".color(:white).bright} - #{"http://rapp.webbynode.com".underline}"
 
       @overwrite   = false
 
@@ -22,7 +22,7 @@ module Webbynode::Commands
       check_initialized
       
       @webby       = param(:webby)
-      @app_name    = io.app_name
+      @app_name    = spinner { io.app_name }
       @git_present = git.present?
       @dns_entry   = option(:dns) ? "#{option(:dns)}" : @app_name
 
@@ -30,7 +30,7 @@ module Webbynode::Commands
       
       check_git_clean if @git_present
       
-      io.log "Initializing application #{@app_name} #{@dns_entry ? "with dns #{@dns_entry}" : ""}", :start
+      io.log "Initializing application #{@app_name.color(:yellow)} #{@dns_entry ? "with dns #{@dns_entry.color(:yellow)}" : ""}"
       
       detect_engine
       
@@ -44,12 +44,12 @@ module Webbynode::Commands
       
       handle_dns option(:dns) if option(:adddns)
       
-      io.log "Application #{@app_name} ready for Rapid Deployment", :finish
+      io.log "Application #{@app_name.color(:yellow)} ready for Rapid Deployment", :finish
       
     rescue Net::SSH::HostKeyMismatch
       io.log ""
       io.log "Error pushing to your server:"
-      io.log "  #{$!}"
+      io.log "  #{$!.to_s.color(:red)}"
       io.log ""
       io.log "This usually happens because you redeployed the server and the fingerprint changed."
       io.log ""
@@ -60,21 +60,22 @@ module Webbynode::Commands
       io.log ""
 
     rescue Webbynode::InvalidAuthentication
-      io.log "Could not connect to webby: invalid authentication.", true
+      io.log "Could not connect to webby: invalid authentication.".color(:red), true
 
     rescue Webbynode::PermissionError
-      io.log "Could not create an SSH key: permission error.", true
+      io.log "Could not create an SSH key: permission error.".color(:red), true
 
     rescue Webbynode::GitRemoteAlreadyExistsError
-      io.log "Application already initialized."
+      io.log "Application already initialized.".color(:red)
     end
     
     private
     
     def check_git_clean
       unless git.clean?
+        io.log ""
         raise CommandError, 
-          "Cannot initialize: git has pending changes. Execute a git commit or add changes to .gitignore and try again."
+          "#{"Cannot initialize:".color(:red)} #{"git has pending changes.".color(:yellow)}\nExecute a git commit or add changes to .gitignore and try again."
       end
     end
     
@@ -82,7 +83,7 @@ module Webbynode::Commands
       return unless pushand_exists?
       
       io.log ""
-      io.log "It seems this application was initialized before."
+      io.log "It seems this application was initialized before.".color(:yellow)
       
       unless ask('Do you want to initialize it again (y/n)?').downcase == 'y'
         puts ""
@@ -130,8 +131,7 @@ module Webbynode::Commands
     def delete_remote
       return unless git.remote_exists?('webbynode')
       
-      io.log ""
-      io.log "Webbynode git integration already initialized."
+      io.log "Webbynode git integration already initialized.".color(:yellow)
       if @overwrite || ask('Do you want to overwrite the current settings (y/n)?').downcase == 'y'
         git.delete_remote('webbynode')
       end
@@ -147,16 +147,17 @@ module Webbynode::Commands
     end
     
     def add_remote
-      io.log "Adding webbynode as git remote..."
+      io.log "Adding webbynode as git remote, please wait..."
       options = {}
       options[:port] = option(:port).to_i if option(:port)
       options[:home] = @git_home if @git_home
 
       params = [@git_user, "webbynode", @webby_ip, @app_name, options]
 
-      Webbynode::Server.new(@webby_ip, @git_user, option(:port) || 22).add_ssh_key LocalSshKey, nil
-
-      git.add_remote *params
+      spinner {
+        Webbynode::Server.new(@webby_ip, @git_user, option(:port) || 22).add_ssh_key LocalSshKey, nil
+        git.add_remote *params
+      }
     end
     
     def create_git_remote
@@ -168,7 +169,7 @@ module Webbynode::Commands
     def get_ip(webby)
       return webby if webby =~ /\b(?:\d{1,3}\.){3}\d{1,3}\b/
         
-      api_webbies = api.webbies
+      api_webbies = spinner { api.webbies } 
       
       unless webby
         # TODO: raise CommandError id size = 0
@@ -176,14 +177,14 @@ module Webbynode::Commands
           webby = api_webbies[api_webbies.keys.first]
         else
           io.log ""
-          io.log "Current Webbies in your account:"
+          io.log "Current Webbies in your account:".color(:yellow)
           io.log ""
         
           choices = []
           api_webbies.keys.sort.each_with_index do |webby_key, i|
             webby = api_webbies[webby_key]
             choices << webby
-            io.log "  #{i+1}. #{webby['name']} (#{webby['ip']})"
+            io.log "  #{i+1}. #{webby['name'].color(:yellow)} (#{webby['ip']})"
           end
         
           io.log "", :simple
@@ -192,7 +193,7 @@ module Webbynode::Commands
         end
         
         io.log "", :simple
-        io.log "Set deployment Webby to #{webby['name']}."
+        io.log "Set deployment Webby to #{webby['name'].color(:yellow)}."
         
         return webby['ip']
       end
@@ -244,7 +245,6 @@ module Webbynode::Commands
       choice = ask("Select the engine your app uses:", Integer) { |q| q.in = 1..(engines.size+1) }
       engine = engines[choice-1]
       
-      io.log ""
       io.log "Initializing with #{engine.engine_name} engine..."
       
       engine