webbynode 1.0.4.3 → 1.0.5.beta2

data/lib/webbynode/commands/push.rb

@@ -34,11 +34,11 @@ module Webbynode::Commands
       perform_before_tasks if before_tasks.has_tasks?
       
       # Logs a initialization message to the user
-      io.log "Pushing #{app_name}", :start
+      io.log "Pushing #{app_name.color(:cyan)}", :start
       
       # Checks for server-side updates
       if check_for_updates
-        io.log "Note: Rapp Engine updated" 
+        io.log "Note: Rapp Engine updated".color(:yellow)
         io.log ""
       end
       
@@ -50,7 +50,7 @@ module Webbynode::Commands
       after_tasks.read_tasks(Webbynode::Commands::Tasks::AfterPushTasksFile)
       perform_after_tasks if after_tasks.has_tasks?
       
-      io.log "Finished pushing #{app_name}", :finish
+      io.log "Finished pushing #{app_name.color(:cyan)}", :finish
     end
     
     
@@ -58,18 +58,18 @@ module Webbynode::Commands
       
       # Performs the before push tasks locally
       def perform_before_tasks
-        io.log "Performing Before Push Tasks...", :action
+        io.log "Performing #{"Before Push".color(:yellow)} Tasks...", :action
         before_tasks.session_tasks.each do |task|
-          io.log "  Performing Task: #{task}", :action
+          io.log "  Performing Task: #{task.color(:cyan)}", :action
           io.exec(task)
         end
       end
       
       # Performs the after push tasks remotely from the application root
       def perform_after_tasks
-        io.log "Performing After Push Tasks...", :action
+        io.log "Performing #{"After Push".color(:yellow)} Tasks...", :action
         after_tasks.session_tasks.each do |task|
-          io.log "  Performing Task: #{task}", :action
+          io.log "  Performing Task: #{task.color(:cyan)}", :action
           remote_executor.exec("cd #{pushand.parse_remote_app_name}; #{task}", true)
         end
       end

data/lib/webbynode/commands/remote.rb

@@ -19,10 +19,14 @@ module Webbynode::Commands
       remote_app_name = pushand.parse_remote_app_name
       
       # Notify the user
-      io.log("Performing the requested remote command..")
+      io.log "Executing remote command...".color(:cyan)
       
       # Executes the command on the remote server inside the application root folder
-      remote_executor.exec("cd #{remote_app_name}; #{param_values.join(" ")}", true)
+      result = spinner {
+        remote_executor.exec("cd #{remote_app_name}; #{param_values.join(" ")}", false)
+      }
+
+      puts result
     end
   end
 end

data/lib/webbynode/commands/settings.rb

@@ -15,7 +15,7 @@ module Webbynode::Commands
     def show
       io.with_setting do |hash|
         hash.each_pair do |k, v|
-          io.log "#{k} = #{v}"
+          io.log "#{k.color(:yellow)} = #{v.to_s.color(:cyan)}"
         end
       end
     end

data/lib/webbynode/commands/tasks.rb

@@ -117,11 +117,11 @@ module Webbynode::Commands
       def show_tasks(from_file = false)
         read_tasks(session_file, true) if from_file
         if session_tasks.empty?
-          io.log_and_exit "You haven't set up any tasks for \"#{type.gsub('_',' ').capitalize}\"."
+          io.log_and_exit "You haven't set up any #{type.gsub('_',' ').capitalize.color(:yellow)} tasks yet."
         end
-        io.log "These are the current tasks for \"#{type.gsub('_',' ').capitalize}\":"
+        io.log "#{type.gsub('_',' ').capitalize.color(:yellow)} tasks:"
         session_tasks.each_with_index do |task, index|
-          io.log "[#{index}] #{task}"
+          io.log "[#{index}] #{task.color(:cyan)}"
         end
       end
       

data/lib/webbynode/commands/version.rb

@@ -2,7 +2,7 @@ module Webbynode::Commands
   class Version < Webbynode::Command
     summary "Displays current version of Webbynode Gem"
     def execute
-      io.log "Rapid Deployment Gem v#{Webbynode::VERSION}", :quiet_start
+      io.log "#{"Rapid Deployment Gem".color(:white).bright} v#{Webbynode::VERSION.color(:yellow)}"
     end
   end
 end

data/lib/webbynode/commands/webbies.rb

@@ -1,28 +1,36 @@
 module Webbynode::Commands
   class Webbies < Webbynode::Command
     summary "Lists the Webbies you currently own"
+    add_alias "list"
     
     def execute
       puts "Fetching list of your Webbies..."
       puts ""
       
       header =  "  "
-      header << "Webbies".ljust(16)
-      header << "IP".ljust(16)
-      header << "Node".ljust(10)
-      header << "Plan".ljust(16)
-      header << "Status".ljust(15)
+      header << "Webbies".ljust(15).color(:white).bright.underline
+      header << " "
+      header << "IP".ljust(15).color(:white).bright.underline
+      header << " "
+      header << "Node".ljust(11).color(:white).bright.underline
+      header << " "
+      header << "Plan".ljust(15).color(:white).bright.underline
+      header << " "
+      header << "Status".ljust(14).color(:white).bright.underline
+      header << " "
       
       puts header
+
+      webbies = spinner { api.webbies }
       
-      api.webbies.each_pair do |name, webby|
+      webbies.each_pair do |name, webby|
         str = "  "
-        str << name.ljust(16)
-        str << webby['ip'].ljust(16)
-        str << webby['node'].ljust(10)
-        str << webby['plan'].ljust(16)
-        str << webby['status']
-        
+        str << name.ljust(16).color(:yellow).bright
+        str << webby['ip'].ljust(16).color(:cyan).bright
+        str << webby['node'].ljust(12).color(:cyan).bright
+        str << webby['plan'].ljust(16).color(:cyan).bright
+        str << (webby['status'] == 'on' ? "on".color(:cyan).bright : "off")
+
         puts str
       end
     end

data/lib/webbynode/engines/rails.rb

@@ -10,12 +10,15 @@ module Webbynode::Engines
     end
     
     def prepare
-      contents = io.read_file("config/database.yml")
-      if contents =~ /mysql2/
-        io.add_setting "rails_adapter", "mysql2"
-      else
-        io.remove_setting "rails_adapter"
+      if io.file_exists?("config/database.yml")
+        contents = io.read_file("config/database.yml")
+        if contents =~ /mysql2/
+          io.add_setting "rails_adapter", "mysql2"
+          return
+        end
       end
+
+      io.remove_setting "rails_adapter"
     end
   end
 end

data/lib/webbynode/engines/rails3.rb

@@ -15,15 +15,22 @@ module Webbynode::Engines
     
     private
     
+    def handle_adapter
+      if io.file_exists?("config/database.yml")
+        contents = io.read_file("config/database.yml")
+        if contents =~ /mysql2/
+          io.add_setting "rails3_adapter", "mysql2"
+          return
+        end
+      end
+
+      io.remove_setting "rails3_adapter"
+    end
+    
     def check_gemfile
       return unless gemfile.present?
       
-      contents = io.read_file("config/database.yml")
-      if contents =~ /mysql2/
-        io.add_setting "rails3_adapter", "mysql2"
-      else
-        io.remove_setting "rails3_adapter"
-      end
+      handle_adapter
 
       dependencies = gemfile.dependencies(:without => [:development, :test])
       if dependencies.include? 'sqlite3-ruby'

data/lib/webbynode/io.rb

@@ -14,6 +14,10 @@ module Webbynode
       Config::CONFIG["host_os"] =~ /mswin|mingw/
     end
     
+    def list_files(dir)
+      Dir.glob(dir)
+    end
+    
     def is_windows?
       Io.is_windows?
     end

data/lib/webbynode/notify.rb

@@ -7,6 +7,7 @@ module Webbynode
     
     def self.message(message)
       if self.installed? and !$testing
+        message = message.gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]/, "")
         %x(growlnotify -t "#{TITLE}" -m "#{message}" --image "#{IMAGE_PATH}")
       end
     end

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'webbyn
 # Set Testing Environment
 $testing = true
 FakeWeb.allow_net_connect = false
+Sickill::Rainbow.enabled  = false
 
 # Helper Methods
 module Webbynode::IoStub

data/spec/webbynode/commands/accounts_spec.rb

@@ -0,0 +1,119 @@
+# Load Spec Helper
+require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'spec_helper')
+
+describe Webbynode::Commands::Accounts do
+  let(:api) { double("API") }
+  let(:io)  { double("Io").as_null_object }
+  
+  def prepare(*params)
+    Webbynode::Commands::Accounts.new(*params).tap do |a|
+      a.stub(:api).and_return(api)
+      a.stub(:io).and_return(io)
+    end
+  end
+  
+  describe '#default' do
+    subject { prepare nil }
+
+    it "shows current account" do
+      api.should_receive(:credentials).and_return({"email" => "fcoury@me.com", "token" => "apitoken"})
+      io.should_receive(:log).with("Current account: fcoury@me.com")
+      subject.execute
+    end
+  end
+  
+  describe '#list' do
+    subject { prepare "list" }
+
+    it "shows all available accounts" do
+      io.should_receive(:list_files).with("#{Webbynode::Io.home_dir}/.webbynode_*").and_return(["#{Webbynode::Io.home_dir}/.webbynode_personal", "#{Webbynode::Io.home_dir}/.webbynode_biz"])
+      io.should_receive(:log).with("personal")
+      io.should_receive(:log).with("biz")
+      subject.execute
+    end
+    
+    it "tells when no configs found" do
+      io.should_receive(:list_files).with("#{Webbynode::Io.home_dir}/.webbynode_*").and_return([])
+      io.should_receive(:log).with("No accounts found. Use 'wn accounts save' to save current account with an alias.")
+      subject.execute
+    end
+  end
+  
+  describe '#save' do
+    subject { prepare "save", "name" }
+    
+    it "copies the properties file" do
+      io.should_receive(:file_exists?).with("#{Webbynode::Io.home_dir}/.webbynode_name").and_return(false)
+      io.should_receive(:copy_file).with("#{Webbynode::Io.home_dir}/.webbynode", "#{Webbynode::Io.home_dir}/.webbynode_name")
+      subject.execute
+    end
+    
+    context "file exists" do
+      context "when confirms overwriting" do
+        it "overwrites the file" do
+          io.should_receive(:file_exists?).with("#{Webbynode::Io.home_dir}/.webbynode_name").and_return(true)
+          subject.should_receive(:ask).with("Do you want to overwrite saved account name (y/n)? ").once.ordered.and_return("y")
+          io.should_receive(:copy_file).with("#{Webbynode::Io.home_dir}/.webbynode", "#{Webbynode::Io.home_dir}/.webbynode_name")
+
+          subject.execute
+        end
+      end
+
+      context "when aborts overwriting" do
+        it "doesn't overwrite the file" do
+          io.should_receive(:file_exists?).with("#{Webbynode::Io.home_dir}/.webbynode_name").and_return(true)
+          subject.should_receive(:ask).with("Do you want to overwrite saved account name (y/n)? ").once.ordered.and_return("n")
+          io.should_receive(:copy_file).with("#{Webbynode::Io.home_dir}/.webbynode", "#{Webbynode::Io.home_dir}/.webbynode_name").never
+          io.should_receive(:log).with("Save aborted.")
+
+          subject.execute
+        end
+      end
+    end
+  end
+  
+  describe '#use' do
+    subject { prepare "use", "name" }
+    
+    it "renames the properties file" do
+      io.should_receive(:file_exists?).with("#{Webbynode::Io.home_dir}/.webbynode_name").and_return(true)
+      io.should_receive(:copy_file).with("#{Webbynode::Io.home_dir}/.webbynode_name", "#{Webbynode::Io.home_dir}/.webbynode")
+      subject.execute
+    end
+    
+    context "when file doesn't exist" do
+      it "shows an error message" do
+        io.should_receive(:file_exists?).with("#{Webbynode::Io.home_dir}/.webbynode_name").and_return(false)
+        io.should_receive(:log).with("Account alias 'name' not found. Use 'wn account list' for a full list.")
+        subject.execute
+      end
+    end
+  end
+  
+  describe '#new' do
+    subject { prepare "new" }
+    
+    it "reinitializes the account" do
+      api.should_receive(:init_credentials).with(true)
+      subject.execute
+    end
+  end
+  
+  describe '#delete' do
+    subject { prepare "delete", "name" }
+    
+    it "deletes the account" do
+      io.should_receive(:file_exists?).with("#{Webbynode::Io.home_dir}/.webbynode_name").and_return(true)
+      io.should_receive(:delete_file).with("#{Webbynode::Io.home_dir}/.webbynode_name")
+      subject.execute
+    end
+    
+    context "when account doesn't exist" do
+      it "shows an error" do
+        io.should_receive(:file_exists?).with("#{Webbynode::Io.home_dir}/.webbynode_name").and_return(false)
+        io.should_receive(:log).with("Account alias 'name' not found. Use 'wn account list' for a full list.")
+        subject.execute
+      end
+    end
+  end
+end

data/spec/webbynode/commands/guides_spec.rb

@@ -0,0 +1,9 @@
+# Load Spec Helper
+require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'spec_helper')
+
+describe Webbynode::Commands::Guides do
+  it "opens Rapp guides in browser" do
+    Launchy.should_receive(:open).with('http://wbno.de/rapp')
+    subject.execute
+  end
+end

data/spec/webbynode/commands/init_spec.rb

@@ -201,14 +201,16 @@ describe Webbynode::Commands::Init do
     context "when no engine was detected" do
       it "prompts for the engine" do
         io_handler.should_receive(:log).with("Supported engines:")
-        io_handler.should_receive(:log).with("  1. Django")
-        io_handler.should_receive(:log).with("  2. WSGI")
-        io_handler.should_receive(:log).with("  3. PHP")
-        io_handler.should_receive(:log).with("  4. Rack")
-        io_handler.should_receive(:log).with("  5. Rails 2")
-        io_handler.should_receive(:log).with("  6. Rails 3")
+        io_handler.should_receive(:log).with("  1. Html")
+        io_handler.should_receive(:log).with("  2. Django")
+        io_handler.should_receive(:log).with("  3. WSGI")
+        io_handler.should_receive(:log).with("  4. PHP")
+        io_handler.should_receive(:log).with("  5. Rack")
+        io_handler.should_receive(:log).with("  6. Rails 2")
+        io_handler.should_receive(:log).with("  7. Rails 3")
+        io_handler.should_receive(:log).with("  8. NodeJS")
 
-        subject.should_receive(:ask).with('Select the engine your app uses:', Integer).and_return(1)
+        subject.should_receive(:ask).with('Select the engine your app uses:', Integer).and_return(2)
 
         io_handler.should_receive(:add_setting).with("engine", "django")
         io_handler.should_receive(:log).with("Initializing with Django engine...")
@@ -267,6 +269,7 @@ describe Webbynode::Commands::Init do
       io.stub(:file_exists?).with("script/rails").and_return(false)
       io.stub(:directory?).with('app').and_return(true)
       io.stub(:directory?).with('app/controllers').and_return(true)
+      io.stub(:file_exists?).with('config/database.yml').and_return(false)
       io.stub(:file_exists?).with('config/environment.rb').and_return(true)
 
       Webbynode::Io.stub(:new).and_return(io)
@@ -731,7 +734,7 @@ describe Webbynode::Commands::Init do
       git_handler.should_receive(:clean?).and_return(false)
       
       lambda { @command.execute }.should raise_error(Webbynode::Command::CommandError,
-        "Cannot initialize: git has pending changes. Execute a git commit or add changes to .gitignore and try again.")
+        "Cannot initialize: git has pending changes.\nExecute a git commit or add changes to .gitignore and try again.")
     end
     
     it "shows that a commit is being added" do

data/spec/webbynode/commands/remote_spec.rb

@@ -24,7 +24,7 @@ describe Webbynode::Commands::Remote do
   end
   
   it "should notify the user" do
-    io.should_receive(:log).with("Performing the requested remote command..")
+    io.should_receive(:log).with("Executing remote command...")
     remote.run
   end
  
@@ -44,7 +44,7 @@ describe Webbynode::Commands::Remote do
       remote.stub(:validate_initialization)
       load_all_mocks(remote)
       pushand.should_receive(:parse_remote_app_name).and_return('test.webbynode.com')
-      re.should_receive(:exec).with("cd test.webbynode.com; ls -la", true)
+      re.should_receive(:exec).with("cd test.webbynode.com; ls -la", false)
       remote.run
     end
     
@@ -55,7 +55,7 @@ describe Webbynode::Commands::Remote do
       remote.stub(:validate_initialization)
       remote.stub(:validate_remote_application_availability)
                   
-      re.should_receive(:exec).with("cd webbynode; these are the params", true)
+      re.should_receive(:exec).with("cd webbynode; these are the params", false).and_return("something")
       remote.run
     end
     

data/spec/webbynode/commands/tasks_spec.rb

@@ -186,15 +186,15 @@ describe Webbynode::Commands::Tasks do
     end
     
     it "should display no tasks, since there are none initially" do
-      io.should_receive(:log).with("These are the current tasks for \"After push\":")
-      io.should_not_receive(:log)
+      io.should_receive(:log).with("After push tasks:")
+      # io.should_not_receive(:log)
       stask.execute
       stask.should have(0).session_tasks
     end
     
     it "should display 3 tasks: task0 task1 task2" do
       3.times {|num| stask.session_tasks << "task#{num}"}
-      io.should_receive(:log).with("These are the current tasks for \"After push\":")
+      io.should_receive(:log).with("After push tasks:")
       stask.stub!(:read_tasks)
       io.should_not_receive(:log_and_exit)
       io.should_receive(:log).with("[0] task0")
@@ -206,8 +206,8 @@ describe Webbynode::Commands::Tasks do
     
     it "should tell the user that there are no tasks if there aren't any" do
       stask.stub!(:read_tasks)
-      io.should_receive(:log_and_exit).with("You haven't set up any tasks for \"After push\".")
-      io.should_not_receive(:log).with("These are the current tasks for \"After push\".")
+      io.should_receive(:log_and_exit).with("You haven't set up any After push tasks yet.")
+      # io.should_not_receive(:log).with("After push tasks:")
       stask.execute
     end
   end
@@ -241,7 +241,7 @@ describe Webbynode::Commands::Tasks do
       end
       
       it "should display the updated list of tasks" do
-        io.should_receive(:log).with("These are the current tasks for \"After push\":")
+        io.should_receive(:log).with("After push tasks:")
         io.should_receive(:log).with("[0] rake db:migrate RAILS_ENV=production")
         task.execute
       end
@@ -274,7 +274,7 @@ describe Webbynode::Commands::Tasks do
       it "should display the updated list of tasks" do
         3.times {|num| rtask.session_tasks << "task#{num}" }
         rtask.stub(:read_tasks)
-        io.should_receive(:log).with("These are the current tasks for \"After push\":")
+        io.should_receive(:log).with("After push tasks:")
         io.should_receive(:log).with("[0] task0")
         io.should_not_receive(:log).with("[1] task1")
         io.should_receive(:log).with("[1] task2")