webbynode 0.2.4.1 → 0.2.5.beta1

data/Manifest

@@ -8,14 +8,14 @@ assets/webbynode.png
 bin/webbynode
 bin/wn
 changelog.rdoc
-cucumber.yml
+cucumber.yml.old
 devver.rake
-features/bootstrap.feature
-features/step_definitions/command_steps.rb
-features/support/env.rb
-features/support/hooks.rb
-features/support/io_features.rb
-features/support/mocha.rb
+inactive_features/bootstrap.feature
+inactive_features/step_definitions/command_steps.rb
+inactive_features/support/env.rb
+inactive_features/support/hooks.rb
+inactive_features/support/io_features.rb
+inactive_features/support/mocha.rb
 lib/templates/api_token
 lib/templates/backup
 lib/templates/gitignore
@@ -27,6 +27,7 @@ lib/webbynode/command.rb
 lib/webbynode/commands/add_backup.rb
 lib/webbynode/commands/add_key.rb
 lib/webbynode/commands/alias.rb
+lib/webbynode/commands/apps.rb
 lib/webbynode/commands/change_dns.rb
 lib/webbynode/commands/config.rb
 lib/webbynode/commands/delete.rb
@@ -52,6 +53,7 @@ lib/webbynode/remote_executor.rb
 lib/webbynode/server.rb
 lib/webbynode/ssh.rb
 lib/webbynode/ssh_keys.rb
+lib/webbynode/updater.rb
 spec/fixtures/aliases
 spec/fixtures/api/credentials
 spec/fixtures/api/dns
@@ -79,6 +81,7 @@ spec/webbynode/command_spec.rb
 spec/webbynode/commands/add_backup_spec.rb
 spec/webbynode/commands/add_key_spec.rb
 spec/webbynode/commands/alias_spec.rb
+spec/webbynode/commands/apps_spec.rb
 spec/webbynode/commands/change_dns_spec.rb
 spec/webbynode/commands/config_spec.rb
 spec/webbynode/commands/delete_spec.rb

data/Rakefile

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

data/{features → inactive_features}/bootstrap.feature

@@ -7,11 +7,10 @@ Feature: Bootstrap an app for deployment
     Given I am running webbynode gem for the first time
      When I run "wn init"
      Then I should see "Missing 'webby' parameter"
-      And I should see "Usage: webbynode init webby \[dns\]"
+      And I should see "Usage: webbynode init \[webby\] \[options\]"
 
   Scenario: Getting help for the init command
     When I run "wn help init"
-    Then I should see "Usage: webbynode init webby \[dns\]"
+    Then I should see "Usage: webbynode init \[webby\] \[options\]"
      And I should see "Parameters:"
      And I should see "    webby               Name or IP of the Webby to deploy to"
-     And I should see "    dns                 The DNS used for this application, optional"

data/lib/webbynode/command.rb

@@ -1,3 +1,8 @@
+begin
+  require 'jcode'
+rescue
+end
+
 module Webbynode
   class Command
     Aliases = {}

data/lib/webbynode/commands/apps.rb

@@ -0,0 +1,12 @@
+module Webbynode::Commands
+  class Apps < Webbynode::Command
+    include Webbynode::Updater
+    
+    summary "Lists all apps installed in your Webby"
+
+    def execute
+      check_for_updates
+      remote_executor.exec "list_apps", true
+    end
+  end
+end

data/lib/webbynode/commands/init.rb

@@ -1,8 +1,8 @@
 module Webbynode::Commands
   class Init < Webbynode::Command
     summary "Prepares the application on current folder for deployment"
-    parameter :webby, String, "Name or IP of the Webby to deploy to"
-    parameter :dns, String, "The DNS used for this application", :required => false
+    parameter :webby, String, "Name or IP of the Webby to deploy to", :required => false
+    option :dns, String, "The DNS used for this application"
     option :adddns, "Creates the DNS entries for the domain"
     option :engine, "Sets the application engine for the app", :validate => { :in => ['php', 'rack', 'rails', 'rails3'] }
     
@@ -11,19 +11,20 @@ module Webbynode::Commands
         io.log help
         return
       end
-      
+
+      check_prerequisites
       check_gemfile
       
       webby       = param(:webby)
       app_name    = io.app_name
       git_present = git.present?
       
-      if param(:dns)
-        dns_entry = "#{param(:dns)}" 
+      if option(:dns)
+        dns_entry = "#{option(:dns)}" 
       else
         dns_entry = app_name
       end
-      
+
       if git_present and !git.clean?
         raise CommandError, 
           "Cannot initialize: git has pending changes. Execute a git commit or add changes to .gitignore and try again."
@@ -31,24 +32,10 @@ module Webbynode::Commands
       
       io.log "Initializing application #{app_name} #{dns_entry ? "with dns #{dns_entry}" : ""}", :start
       
-      if webby =~ /\b(?:\d{1,3}\.){3}\d{1,3}\b/
-        webby_ip = webby
-      else
-        begin
-          io.log "Retrieving IP for Webby #{webby}...", :action
-          webby_ip = api.ip_for(webby)
-          unless webby_ip
-            if (webbies = api.webbies.keys) and webbies.any?
-              raise CommandError, 
-                "Couldn't find Webby '#{webby}' on your account. Your Webbies are: #{webbies.map { |w| "'#{w}'"}.to_phrase}."
-            else
-              raise CommandError, "You don't have any active Webbies on your account."
-            end
-          end
-        end
-      end
+      webby_ip = get_ip(webby)
       
-      io.log "Initializing directory structure...", :action
+      io.log ""
+      io.log "Initializing directory structure..."
       git.remove("config/database.yml") if git.tracks?("config/database.yml")
       git.remove("db/schema.rb")        if git.tracks?("db/schema.rb")
       
@@ -63,7 +50,8 @@ module Webbynode::Commands
       end
       
       unless io.directory?(".webbynode")
-        io.exec("mkdir -p .webbynode/tasks") 
+        io.mkdir(".webbynode/tasks")
+
         io.create_file(".webbynode/tasks/after_push", "")
         io.create_file(".webbynode/tasks/before_push", "")
         io.create_file(".webbynode/aliases", "")
@@ -73,36 +61,86 @@ module Webbynode::Commands
       detect_engine
       
       unless git_present
-        io.log "Initializing git and applying initial commit...", :action
+        io.log "Initializing git and applying initial commit..."
         git.init 
         git.add "." 
         git.commit "Initial commit"
       end
       
       if git.remote_exists?('webbynode')
-        if ask('Webbynode already initialized. Do you want to overwrite the current settings (y/n)?').downcase == 'y'
+        io.log ""
+        io.log "Webbynode git integration already initialized."
+        if ask('Do you want to overwrite the current settings (y/n)?').downcase == 'y'
           git.delete_remote('webbynode')
         end
+        io.log ""
       end
       
       if !git.remote_exists?('webbynode') and git_present
-        io.log "Commiting Webbynode changes...", :action
+        io.log "Commiting Webbynode changes..."
         git.add "." 
         git.commit2 "[Webbynode] Rapid App Deployment Initialization"
       end
       
-      io.log "Adding webbynode as git remote...", :action
+      io.log "Adding webbynode as git remote..."
       git.add_remote "webbynode", webby_ip, app_name
       
-      handle_dns param(:dns) if option(:adddns)
+      handle_dns option(:dns) if option(:adddns)
       
       io.log "Application #{app_name} ready for Rapid Deployment", :finish
     rescue Webbynode::GitRemoteAlreadyExistsError
-      io.log "Application already initialized.", true
+      io.log "Application already initialized."
     end
     
     private
     
+    def get_ip(webby)
+      return webby if webby =~ /\b(?:\d{1,3}\.){3}\d{1,3}\b/
+        
+      api_webbies = api.webbies
+      
+      unless webby
+        # TODO: raise CommandError id size = 0
+        if api_webbies.keys.size == 1
+          webby = api_webbies[api_webbies.keys.first]
+        else
+          io.log "", :simple
+          io.log "Current Webbies in your account:", :simple
+          io.log "", :simple
+        
+          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]})", :simple
+          end
+        
+          io.log "", :simple
+          choice = ask("Which Webby do you want to deploy to:", Integer) { |q| q.in = 1..(api_webbies.size+1) }
+          webby  = choices[choice-1]
+        end
+        
+        io.log "", :simple
+        io.log "Set deployment Webby to #{webby[:name]}.", :simple
+        
+        return webby[:ip]
+      end
+
+      io.log "Retrieving IP for Webby #{webby}...", :action
+      webby_ip = api.ip_for(webby)
+
+      unless webby_ip
+        if (webbies = api_webbies.keys) and webbies.any?
+          raise CommandError, 
+            "Couldn't find Webby '#{webby}' on your account. Your Webbies are: #{webbies.map { |w| "'#{w}'"}.to_phrase}."
+        else
+          raise CommandError, "You don't have any active Webbies on your account."
+        end
+      end
+      
+      webby_ip
+    end
+    
     def detect_engine
       unless engine = option(:engine)
         if rails3?
@@ -118,6 +156,17 @@ module Webbynode::Commands
       io.file_exists?("script/rails")
     end
     
+    def check_prerequisites
+      unless io.exec_in_path?('git')
+        raise CommandError, <<-EOS 
+Error: git not found on current path.
+
+In order to use Webbynode Gem for deployment, you must have git installed.
+For more information about installing git: http://book.git-scm.com/2_installing_git.html
+EOS
+      end
+    end
+    
     def check_gemfile
       return unless gemfile.present?
       

data/lib/webbynode/commands/push.rb

@@ -1,5 +1,6 @@
 module Webbynode::Commands
   class Push < Webbynode::Command
+    include Webbynode::Updater
     
     requires_initialization!
     
@@ -33,8 +34,15 @@ module Webbynode::Commands
       perform_before_tasks if before_tasks.has_tasks?
       
       # Logs a initialization message to the user
-      # Pushes the application to Webbynode
       io.log "Pushing #{app_name}", :start
+      
+      # Checks for server-side updates
+      if check_for_updates
+        io.log "Note: Rapp Engine updated" 
+        io.log ""
+      end
+      
+      # Pushes the application to Webbynode
       io.exec("git push webbynode master", false)
       
       # Reads out the "after push" tasks file to see if there are any tasks that must be performed

data/lib/webbynode/commands/tasks.rb

@@ -58,7 +58,7 @@ module Webbynode::Commands
     # Ensures the presence of the .webbynode/tasks folder
     # Will create the necessary task files when they are not available
     def ensure_tasks_folder
-      io.exec('mkdir .webbynode/tasks') unless io.directory?(".webbynode/tasks")
+      io.mkdir('.webbynode/tasks') unless io.directory?(".webbynode/tasks")
       %w[before_push after_push].each do |file|
         io.exec("touch .webbynode/tasks/#{file}") unless io.file_exists?(".webbynode/tasks/#{file}")
       end

data/lib/webbynode/io.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'fileutils'
+require 'rbconfig'
 
 module Webbynode
   class DirectoryNotFound < StandardError; end
@@ -9,10 +10,41 @@ module Webbynode
     
     TemplatesPath = File.join(File.dirname(__FILE__), '..', 'templates')
     
+    def is_windows?
+      Config::CONFIG["host_os"] =~ /mswin|mingw/
+    end
+    
+    def exists_in_path?(file)
+      search_in_path { |f| File.exists?("#{f}/#{file}") }
+    end
+    
+    def exec_in_path?(file)
+      search_in_path do |f| 
+        if is_windows?
+          File.executable?("#{f}/#{file}") || 
+          File.executable?("#{f}/#{file}.exe") || 
+          File.executable?("#{f}/#{file}.bat") || 
+          File.executable?("#{f}/#{file}.cmd")
+        else
+          File.executable?("#{f}/#{file}")
+        end
+      end
+    end
+    
+    def search_in_path(&blk)
+      return false unless block_given?
+      entries = ENV['PATH'].split(is_windows? ? ";" : ":")
+      entries.any? &blk
+    end
+    
     def app_name
       Dir.pwd.split("/").last.gsub(/[\.| ]/, "_")
     end
     
+    def mkdir(path)
+      FileUtils.mkdir_p(path)
+    end
+    
     def exec(s, redirect_stderr=true)
       `#{s}#{redirect_stderr ? " 2>&1" : ""}`
     end
@@ -39,13 +71,17 @@ module Webbynode
     end
     
     def log(text, notify=false)
-      notify = :action unless notify
+      notify = :simple unless notify
 
       case notify
       when :notify
         notify = true
         puts "#{text}" 
       
+      when :simple
+        notify = false
+        puts "#{text}" 
+      
       when :start
         notify = true
         puts "[Webbynode] #{text}" 

data/lib/webbynode/notify.rb

@@ -1,4 +1,5 @@
 module Webbynode
+
   class Notify
     
     TITLE       = "Webbynode"
@@ -11,8 +12,7 @@ module Webbynode
     end
     
     def self.installed?
-      return false if %x(which growlnotify).chomp.empty?
-      true
+      @installed ||= Io.new.exec_in_path?("growlnotify")
     end
     
   end

data/lib/webbynode/option.rb

@@ -52,7 +52,7 @@ module Webbynode
     end
     
     def parse(s)
-      if s =~ /^--(\w+)(=("[^"]+"|[\w]+))*/
+      if s =~ /^--(\w+)(=("[^"]+"|[\w\.]+))*/
         self.value = $3 ? $3.gsub(/"/, "") : true
       end
     end

data/lib/webbynode/remote_executor.rb

@@ -14,8 +14,8 @@ module Webbynode
       ssh.execute "mkdir -p #{folder}"
     end
     
-    def exec(cmd, echo=false)
-      ssh.execute(cmd, echo)
+    def exec(cmd, echo=false, exit_code=false)
+      ssh.execute(cmd, echo, exit_code)
     end
   end
 end

data/lib/webbynode/ssh.rb

@@ -29,7 +29,7 @@ module Webbynode
     
     end
     
-    def execute(script, echo=false)
+    def execute(script, echo=false, ret_exit_code=false)
       connect
       output = ""
       error_output = ""
@@ -59,6 +59,7 @@ module Webbynode
       
       channel.wait
       
+      return exit_code if ret_exit_code
       output
     end
   end

data/lib/webbynode/updater.rb

@@ -0,0 +1,19 @@
+module Webbynode
+  module Updater
+    def check_for_updates
+      updated = remote_executor.exec(<<-EOS, false, true)
+      if [ ! -f /var/webbynode/update_rapp ]; then
+        cd /var/webbynode
+        wget http://repo.webbynode.com/rapidapps/update_rapp
+        chmod +x update_rapp
+        ln -s -f /var/webbynode/update_rapp /usr/bin/update_rapp
+      fi
+
+      /var/webbynode/update_rapp
+      if [ $? -eq 1 ]; then exit 1; fi
+      EOS
+    
+      updated == 1
+    end
+  end
+end

data/lib/webbynode.rb

@@ -19,7 +19,9 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'parameter')
 require File.join(File.dirname(__FILE__), 'webbynode', 'api_client')
 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', 'properties')
+require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'apps')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'init')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'push')
 require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'config')
@@ -40,7 +42,7 @@ require File.join(File.dirname(__FILE__), 'webbynode', 'commands', 'version')
 require File.join(File.dirname(__FILE__), 'webbynode', 'application')
 
 module Webbynode
-  VERSION = '0.2.4.1'
+  VERSION = '0.2.5.beta1'
 end
 
 class Array

data/spec/webbynode/commands/apps_spec.rb

@@ -0,0 +1,17 @@
+# Load Spec Helper
+require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'spec_helper')
+
+describe Webbynode::Commands::Apps do
+  let(:re)      { double("RemoteExecutor").as_null_object }
+
+  subject do
+    Webbynode::Commands::Apps.new.tap do |cmd|
+      cmd.stub!(:remote_executor).and_return(re)
+    end
+  end
+  
+  it "executes list_apps remotely" do
+    re.should_receive(:exec).with("list_apps", true)
+    subject.execute
+  end
+end

data/spec/webbynode/commands/init_spec.rb

@@ -7,6 +7,7 @@ describe Webbynode::Commands::Init do
   let(:gemfile)     { double("gemfile").as_null_object.tap { |g| g.stub!(:present?).and_return(false) } }
   
   def create_init(ip="4.3.2.1", host=nil, extra=[])
+    host = "--dns=#{host}" if host
     @command = Webbynode::Commands::Init.new(ip, host, *extra)
     @command.stub!(:gemfile).and_return(gemfile)
     @command.should_receive(:git).any_number_of_times.and_return(git_handler) 
@@ -19,6 +20,88 @@ describe Webbynode::Commands::Init do
     git_handler.stub!(:remote_exists?).and_return(false)
   end
   
+  context 'Checking prerequisites' do
+    subject do
+      Webbynode::Commands::Init.new.tap do |cmd|
+        cmd.stub!(:git).and_return(git_handler)
+        cmd.stub!(:io).and_return(io_handler)
+      end      
+    end
+
+    it "raises an error if git is not found" do
+      io_handler.should_receive(:exec_in_path?).with('git').and_return(false)
+      lambda { subject.execute }.should raise_error(Webbynode::Command::CommandError)
+    end
+  end
+  
+  context "Deployment webby" do
+    let(:api) { double("api").as_null_object }
+    subject do
+      Webbynode::Commands::Init.new.tap do |cmd|
+        cmd.stub!(:git).and_return(git_handler)
+        cmd.stub!(:io).and_return(io_handler)
+        cmd.stub!(:api).and_return(api)
+      end      
+    end
+    
+    it "is detected automatically if user only have one Webby" do
+      webbies = {
+        'sandbox' => {
+          :ip     => "201.81.121.201",
+          :status => "on",
+          :name   => "sandbox",
+          :notes  => "",
+          :plan   => "Webbybeta",
+          :node   => "miami-b15"
+        }
+      }
+      api.should_receive(:webbies).and_return(webbies)
+      git_handler.should_receive(:add_remote).with("webbynode", "201.81.121.201", anything())
+      
+      subject.run
+    end
+    
+    it "complains if missing and user has > 1 webby" do
+      webbies = {
+        'webby3' => {
+          :ip     => "67.53.31.3",
+          :status => "on",
+          :name   => "webby3",
+          :notes  => "",
+          :plan   => "Webbybeta",
+          :node   => "miami-b11"
+        },
+        'sandbox' => {
+          :ip     => "201.81.121.201",
+          :status => "on",
+          :name   => "sandbox",
+          :notes  => "",
+          :plan   => "Webbybeta",
+          :node   => "miami-b15"
+        },
+        'webby2' => {
+          :ip     => "67.53.31.2",
+          :status => "on",
+          :name   => "webby2",
+          :notes  => "",
+          :plan   => "Webbybeta",
+          :node   => "miami-b11"
+        }
+      }
+      api.should_receive(:webbies).and_return(webbies)
+      io_handler.should_receive(:log).with("Current Webbies in your account:", anything())
+      io_handler.should_receive(:log).with("  1. sandbox (201.81.121.201)", anything())
+      io_handler.should_receive(:log).with("  2. webby2 (67.53.31.2)", anything())
+      io_handler.should_receive(:log).with("  3. webby3 (67.53.31.3)", anything())
+      subject.should_receive(:ask).with("Which Webby do you want to deploy to:", Integer).and_return(2)
+
+      io_handler.should_receive(:log).with("Set deployment Webby to webby2.", anything())
+      git_handler.should_receive(:add_remote).with("webbynode", "67.53.31.2", anything())
+      
+      subject.run
+    end
+  end
+  
   context "Gemfile checking" do
     context "when present" do
       it "complains if there is a sqlite3-ruby dependency outside of development and test groups" do
@@ -46,7 +129,7 @@ describe Webbynode::Commands::Init do
       command = Webbynode::Commands::Init.new("10.0.1.1")
       command.stub!(:gemfile).and_return(gemfile)
       command.should_receive(:git).any_number_of_times.and_return(git_handler) 
-      command.should_receive(:ask).with("Webbynode already initialized. Do you want to overwrite the current settings (y/n)?").once.ordered.and_return("n")
+      command.should_receive(:ask).with("Do you want to overwrite the current settings (y/n)?").once.ordered.and_return("n")
 
       git_handler.should_receive(:present?).and_return(true)
       git_handler.should_receive(:remote_exists?).with("webbynode").and_return(true)
@@ -59,7 +142,7 @@ describe Webbynode::Commands::Init do
       command = Webbynode::Commands::Init.new("10.0.1.1")
       command.stub!(:gemfile).and_return(gemfile)
       command.should_receive(:git).any_number_of_times.and_return(git_handler) 
-      command.should_receive(:ask).with("Webbynode already initialized. Do you want to overwrite the current settings (y/n)?").once.ordered.and_return("y")
+      command.should_receive(:ask).with("Do you want to overwrite the current settings (y/n)?").once.ordered.and_return("y")
 
       git_handler.should_receive(:present?).and_return(true)
       git_handler.should_receive(:remote_exists?).with("webbynode").and_return(true)
@@ -86,7 +169,7 @@ describe Webbynode::Commands::Init do
     let(:io) { io = double("Io").as_null_object }
 
     def create_init(ip="4.3.2.1", host=nil, extra=[])
-      @command = Webbynode::Commands::Init.new(ip, host, *extra)
+      @command = Webbynode::Commands::Init.new(ip, "--dns=#{host}", *extra)
       @command.stub!(:gemfile).and_return(gemfile)
       @command.should_receive(:git).any_number_of_times.and_return(git_handler) 
     end
@@ -247,6 +330,7 @@ describe Webbynode::Commands::Init do
   
   it "should try to get Webby's IP if no IP given" do
     api = double("ApiClient")
+    api.stub!(:webbies).and_return(['a', 'b'])
     api.should_receive(:ip_for).with("my_webby_name").and_return("1.2.3.4")
     
     io_handler.should_receive(:app_name).any_number_of_times.and_return("my_app")
@@ -254,7 +338,7 @@ describe Webbynode::Commands::Init do
     git_handler.should_receive(:add_remote).with("webbynode", "1.2.3.4", "my_app")
 
     create_init("my_webby_name")
-    @command.should_receive(:api).and_return(api)
+    @command.stub!(:api).and_return(api)
     @command.run
   end
   
@@ -335,7 +419,7 @@ describe Webbynode::Commands::Init do
   context "when .webbynode is not present" do
     it "should create the .webbynode system folder and stub files" do
       io_handler.should_receive(:directory?).with(".webbynode").and_return(false)
-      io_handler.should_receive(:exec).with("mkdir -p .webbynode/tasks")
+      io_handler.should_receive(:mkdir).with(".webbynode/tasks")
       io_handler.should_receive(:create_file).with(".webbynode/tasks/after_push", "")
       io_handler.should_receive(:create_file).with(".webbynode/tasks/before_push", "")
       io_handler.should_receive(:create_file).with(".webbynode/aliases", "")
@@ -411,7 +495,7 @@ describe Webbynode::Commands::Init do
     end
     
     it "shows that a commit is being added" do
-      io_handler.should_receive(:log).with("Commiting Webbynode changes...", :action)
+      io_handler.should_receive(:log).with("Commiting Webbynode changes...")
       git_handler.should_receive(:present?).and_return(true)
       
       @command.run
@@ -442,7 +526,7 @@ describe Webbynode::Commands::Init do
       git_handler.should_receive(:present?).and_return(true)
       git_handler.should_receive(:add_remote).and_raise(Webbynode::GitRemoteAlreadyExistsError)
       
-      io_handler.should_receive(:log).with("Application already initialized.", true)
+      io_handler.should_receive(:log).with("Application already initialized.")
       @command.run
     end
   end

data/spec/webbynode/commands/push_spec.rb

@@ -18,6 +18,34 @@ describe Webbynode::Commands::Push do
     push.after_tasks.stub!(:read_tasks)
   end
   
+  subject do
+    Webbynode::Commands::Push.new.tap do |cmd|
+      cmd.stub!(:io).and_return(io)
+      cmd.stub!(:remote_executor).and_return(re)
+      cmd.stub!(:pushand).and_return(pushand)
+      cmd.stub!(:git).and_return(git)
+      cmd.after_tasks.stub!(:read_tasks)
+    end
+  end
+  
+  context "before pushing" do
+    it "checks for update_rapp script remotely" do
+      re.should_receive(:exec).with(<<-EOS, false, true)
+      if [ ! -f /var/webbynode/update_rapp ]; then
+        cd /var/webbynode
+        wget http://repo.webbynode.com/rapidapps/update_rapp
+        chmod +x update_rapp
+        ln -s -f /var/webbynode/update_rapp /usr/bin/update_rapp
+      fi
+
+      /var/webbynode/update_rapp
+      if [ $? -eq 1 ]; then exit 1; fi
+      EOS
+      
+      subject.execute
+    end
+  end
+  
   context "when the user runs the command" do
     it "should display a message that the application is being pushed to the webby" do
       pushand.should_receive(:parse_remote_app_name).and_return("test.webbynode.com")

data/spec/webbynode/commands/tasks_spec.rb

@@ -51,7 +51,7 @@ describe Webbynode::Commands::Tasks do
       end
       
       it "should create the webbynode tasks folder" do
-        io.should_receive(:exec).with('mkdir .webbynode/tasks')
+        io.should_receive(:mkdir).with('.webbynode/tasks')
         task.execute
       end
       
@@ -76,12 +76,12 @@ describe Webbynode::Commands::Tasks do
       end
       
       it "should create the webbynode folder" do
-        io.should_not_receive(:exec).with('mkdir .webbynode')
+        io.should_not_receive(:mkdir).with('.webbynode')
         task.execute
       end
       
       it "should create the webbynode folder" do
-        io.should_not_receive(:exec).with('mkdir .webbynode/tasks')
+        io.should_not_receive(:mkdir).with('.webbynode/tasks')
         task.execute
       end
       

data/spec/webbynode/remote_executor_spec.rb

@@ -11,7 +11,7 @@ describe Webbynode::RemoteExecutor do
   
   describe "#exec" do
     it "should execute the raw command on the server" do
-      @ssh.should_receive(:execute).with("the same string I pass", false)
+      @ssh.should_receive(:execute).with("the same string I pass", false, false)
       @re.exec "the same string I pass"
     end
   end

data/webbynode.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webbynode}
-  s.version = "0.2.4.1"
+  s.version = "0.2.5.beta1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felipe Coury"]
-  s.date = %q{2010-06-28}
+  s.date = %q{2010-06-30}
   s.description = %q{Webbynode Deployment Gem}
   s.email = %q{felipe@webbynode.com}
   s.executables = ["webbynode", "wn"]
-  s.extra_rdoc_files = ["README.rdoc", "bin/webbynode", "bin/wn", "lib/templates/api_token", "lib/templates/backup", "lib/templates/gitignore", "lib/templates/help", "lib/webbynode.rb", "lib/webbynode/api_client.rb", "lib/webbynode/application.rb", "lib/webbynode/command.rb", "lib/webbynode/commands/add_backup.rb", "lib/webbynode/commands/add_key.rb", "lib/webbynode/commands/alias.rb", "lib/webbynode/commands/change_dns.rb", "lib/webbynode/commands/config.rb", "lib/webbynode/commands/delete.rb", "lib/webbynode/commands/help.rb", "lib/webbynode/commands/init.rb", "lib/webbynode/commands/push.rb", "lib/webbynode/commands/remote.rb", "lib/webbynode/commands/restart.rb", "lib/webbynode/commands/start.rb", "lib/webbynode/commands/stop.rb", "lib/webbynode/commands/tasks.rb", "lib/webbynode/commands/version.rb", "lib/webbynode/commands/webbies.rb", "lib/webbynode/gemfile.rb", "lib/webbynode/git.rb", "lib/webbynode/io.rb", "lib/webbynode/notify.rb", "lib/webbynode/option.rb", "lib/webbynode/parameter.rb", "lib/webbynode/properties.rb", "lib/webbynode/push_and.rb", "lib/webbynode/remote_executor.rb", "lib/webbynode/server.rb", "lib/webbynode/ssh.rb", "lib/webbynode/ssh_keys.rb"]
-  s.files = ["History.txt", "Manifest", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "assets/webbynode.png", "bin/webbynode", "bin/wn", "changelog.rdoc", "cucumber.yml", "devver.rake", "features/bootstrap.feature", "features/step_definitions/command_steps.rb", "features/support/env.rb", "features/support/hooks.rb", "features/support/io_features.rb", "features/support/mocha.rb", "lib/templates/api_token", "lib/templates/backup", "lib/templates/gitignore", "lib/templates/help", "lib/webbynode.rb", "lib/webbynode/api_client.rb", "lib/webbynode/application.rb", "lib/webbynode/command.rb", "lib/webbynode/commands/add_backup.rb", "lib/webbynode/commands/add_key.rb", "lib/webbynode/commands/alias.rb", "lib/webbynode/commands/change_dns.rb", "lib/webbynode/commands/config.rb", "lib/webbynode/commands/delete.rb", "lib/webbynode/commands/help.rb", "lib/webbynode/commands/init.rb", "lib/webbynode/commands/push.rb", "lib/webbynode/commands/remote.rb", "lib/webbynode/commands/restart.rb", "lib/webbynode/commands/start.rb", "lib/webbynode/commands/stop.rb", "lib/webbynode/commands/tasks.rb", "lib/webbynode/commands/version.rb", "lib/webbynode/commands/webbies.rb", "lib/webbynode/gemfile.rb", "lib/webbynode/git.rb", "lib/webbynode/io.rb", "lib/webbynode/notify.rb", "lib/webbynode/option.rb", "lib/webbynode/parameter.rb", "lib/webbynode/properties.rb", "lib/webbynode/push_and.rb", "lib/webbynode/remote_executor.rb", "lib/webbynode/server.rb", "lib/webbynode/ssh.rb", "lib/webbynode/ssh_keys.rb", "spec/fixtures/aliases", "spec/fixtures/api/credentials", "spec/fixtures/api/dns", "spec/fixtures/api/dns_a_record", "spec/fixtures/api/dns_a_record_already_exists", "spec/fixtures/api/dns_a_record_error", "spec/fixtures/api/dns_new_zone", "spec/fixtures/api/webbies", "spec/fixtures/api/webbies_unauthorized", "spec/fixtures/api/webby", "spec/fixtures/commands/tasks/after_push", "spec/fixtures/fixture_helpers", "spec/fixtures/git/config/210.11.13.12", "spec/fixtures/git/config/67.23.79.31", "spec/fixtures/git/config/67.23.79.32", "spec/fixtures/git/config/config", "spec/fixtures/git/config/config_5", "spec/fixtures/git/status/clean", "spec/fixtures/git/status/dirty", "spec/fixtures/pushand", "spec/spec_helper.rb", "spec/webbynode/api_client_spec.rb", "spec/webbynode/application_spec.rb", "spec/webbynode/command_spec.rb", "spec/webbynode/commands/add_backup_spec.rb", "spec/webbynode/commands/add_key_spec.rb", "spec/webbynode/commands/alias_spec.rb", "spec/webbynode/commands/change_dns_spec.rb", "spec/webbynode/commands/config_spec.rb", "spec/webbynode/commands/delete_spec.rb", "spec/webbynode/commands/help_spec.rb", "spec/webbynode/commands/init_spec.rb", "spec/webbynode/commands/push_spec.rb", "spec/webbynode/commands/remote_spec.rb", "spec/webbynode/commands/tasks_spec.rb", "spec/webbynode/commands/version_spec.rb", "spec/webbynode/commands/webbies_spec.rb", "spec/webbynode/gemfile_spec.rb", "spec/webbynode/git_spec.rb", "spec/webbynode/io_spec.rb", "spec/webbynode/option_spec.rb", "spec/webbynode/parameter_spec.rb", "spec/webbynode/push_and_spec.rb", "spec/webbynode/remote_executor_spec.rb", "spec/webbynode/server_spec.rb", "webbynode.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "bin/webbynode", "bin/wn", "lib/templates/api_token", "lib/templates/backup", "lib/templates/gitignore", "lib/templates/help", "lib/webbynode.rb", "lib/webbynode/api_client.rb", "lib/webbynode/application.rb", "lib/webbynode/command.rb", "lib/webbynode/commands/add_backup.rb", "lib/webbynode/commands/add_key.rb", "lib/webbynode/commands/alias.rb", "lib/webbynode/commands/apps.rb", "lib/webbynode/commands/change_dns.rb", "lib/webbynode/commands/config.rb", "lib/webbynode/commands/delete.rb", "lib/webbynode/commands/help.rb", "lib/webbynode/commands/init.rb", "lib/webbynode/commands/push.rb", "lib/webbynode/commands/remote.rb", "lib/webbynode/commands/restart.rb", "lib/webbynode/commands/start.rb", "lib/webbynode/commands/stop.rb", "lib/webbynode/commands/tasks.rb", "lib/webbynode/commands/version.rb", "lib/webbynode/commands/webbies.rb", "lib/webbynode/gemfile.rb", "lib/webbynode/git.rb", "lib/webbynode/io.rb", "lib/webbynode/notify.rb", "lib/webbynode/option.rb", "lib/webbynode/parameter.rb", "lib/webbynode/properties.rb", "lib/webbynode/push_and.rb", "lib/webbynode/remote_executor.rb", "lib/webbynode/server.rb", "lib/webbynode/ssh.rb", "lib/webbynode/ssh_keys.rb", "lib/webbynode/updater.rb"]
+  s.files = ["History.txt", "Manifest", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "assets/webbynode.png", "bin/webbynode", "bin/wn", "changelog.rdoc", "cucumber.yml.old", "devver.rake", "inactive_features/bootstrap.feature", "inactive_features/step_definitions/command_steps.rb", "inactive_features/support/env.rb", "inactive_features/support/hooks.rb", "inactive_features/support/io_features.rb", "inactive_features/support/mocha.rb", "lib/templates/api_token", "lib/templates/backup", "lib/templates/gitignore", "lib/templates/help", "lib/webbynode.rb", "lib/webbynode/api_client.rb", "lib/webbynode/application.rb", "lib/webbynode/command.rb", "lib/webbynode/commands/add_backup.rb", "lib/webbynode/commands/add_key.rb", "lib/webbynode/commands/alias.rb", "lib/webbynode/commands/apps.rb", "lib/webbynode/commands/change_dns.rb", "lib/webbynode/commands/config.rb", "lib/webbynode/commands/delete.rb", "lib/webbynode/commands/help.rb", "lib/webbynode/commands/init.rb", "lib/webbynode/commands/push.rb", "lib/webbynode/commands/remote.rb", "lib/webbynode/commands/restart.rb", "lib/webbynode/commands/start.rb", "lib/webbynode/commands/stop.rb", "lib/webbynode/commands/tasks.rb", "lib/webbynode/commands/version.rb", "lib/webbynode/commands/webbies.rb", "lib/webbynode/gemfile.rb", "lib/webbynode/git.rb", "lib/webbynode/io.rb", "lib/webbynode/notify.rb", "lib/webbynode/option.rb", "lib/webbynode/parameter.rb", "lib/webbynode/properties.rb", "lib/webbynode/push_and.rb", "lib/webbynode/remote_executor.rb", "lib/webbynode/server.rb", "lib/webbynode/ssh.rb", "lib/webbynode/ssh_keys.rb", "lib/webbynode/updater.rb", "spec/fixtures/aliases", "spec/fixtures/api/credentials", "spec/fixtures/api/dns", "spec/fixtures/api/dns_a_record", "spec/fixtures/api/dns_a_record_already_exists", "spec/fixtures/api/dns_a_record_error", "spec/fixtures/api/dns_new_zone", "spec/fixtures/api/webbies", "spec/fixtures/api/webbies_unauthorized", "spec/fixtures/api/webby", "spec/fixtures/commands/tasks/after_push", "spec/fixtures/fixture_helpers", "spec/fixtures/git/config/210.11.13.12", "spec/fixtures/git/config/67.23.79.31", "spec/fixtures/git/config/67.23.79.32", "spec/fixtures/git/config/config", "spec/fixtures/git/config/config_5", "spec/fixtures/git/status/clean", "spec/fixtures/git/status/dirty", "spec/fixtures/pushand", "spec/spec_helper.rb", "spec/webbynode/api_client_spec.rb", "spec/webbynode/application_spec.rb", "spec/webbynode/command_spec.rb", "spec/webbynode/commands/add_backup_spec.rb", "spec/webbynode/commands/add_key_spec.rb", "spec/webbynode/commands/alias_spec.rb", "spec/webbynode/commands/apps_spec.rb", "spec/webbynode/commands/change_dns_spec.rb", "spec/webbynode/commands/config_spec.rb", "spec/webbynode/commands/delete_spec.rb", "spec/webbynode/commands/help_spec.rb", "spec/webbynode/commands/init_spec.rb", "spec/webbynode/commands/push_spec.rb", "spec/webbynode/commands/remote_spec.rb", "spec/webbynode/commands/tasks_spec.rb", "spec/webbynode/commands/version_spec.rb", "spec/webbynode/commands/webbies_spec.rb", "spec/webbynode/gemfile_spec.rb", "spec/webbynode/git_spec.rb", "spec/webbynode/io_spec.rb", "spec/webbynode/option_spec.rb", "spec/webbynode/parameter_spec.rb", "spec/webbynode/push_and_spec.rb", "spec/webbynode/remote_executor_spec.rb", "spec/webbynode/server_spec.rb", "webbynode.gemspec"]
   s.homepage = %q{http://webbynode.com}
   s.post_install_message = %q{
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: webbynode
 version: !ruby/object:Gem::Version 
-  hash: 77
-  prerelease: false
+  hash: -1848230071
+  prerelease: true
   segments: 
   - 0
   - 2
-  - 4
-  - 1
-  version: 0.2.4.1
+  - 5
+  - beta1
+  version: 0.2.5.beta1
 platform: ruby
 authors: 
 - Felipe Coury
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -03:00
+date: 2010-06-30 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,6 +121,7 @@ extra_rdoc_files:
 - lib/webbynode/commands/add_backup.rb
 - lib/webbynode/commands/add_key.rb
 - lib/webbynode/commands/alias.rb
+- lib/webbynode/commands/apps.rb
 - lib/webbynode/commands/change_dns.rb
 - lib/webbynode/commands/config.rb
 - lib/webbynode/commands/delete.rb
@@ -146,6 +147,7 @@ extra_rdoc_files:
 - lib/webbynode/server.rb
 - lib/webbynode/ssh.rb
 - lib/webbynode/ssh_keys.rb
+- lib/webbynode/updater.rb
 files: 
 - History.txt
 - Manifest
@@ -157,14 +159,14 @@ files:
 - bin/webbynode
 - bin/wn
 - changelog.rdoc
-- cucumber.yml
+- cucumber.yml.old
 - devver.rake
-- features/bootstrap.feature
-- features/step_definitions/command_steps.rb
-- features/support/env.rb
-- features/support/hooks.rb
-- features/support/io_features.rb
-- features/support/mocha.rb
+- inactive_features/bootstrap.feature
+- inactive_features/step_definitions/command_steps.rb
+- inactive_features/support/env.rb
+- inactive_features/support/hooks.rb
+- inactive_features/support/io_features.rb
+- inactive_features/support/mocha.rb
 - lib/templates/api_token
 - lib/templates/backup
 - lib/templates/gitignore
@@ -176,6 +178,7 @@ files:
 - lib/webbynode/commands/add_backup.rb
 - lib/webbynode/commands/add_key.rb
 - lib/webbynode/commands/alias.rb
+- lib/webbynode/commands/apps.rb
 - lib/webbynode/commands/change_dns.rb
 - lib/webbynode/commands/config.rb
 - lib/webbynode/commands/delete.rb
@@ -201,6 +204,7 @@ files:
 - lib/webbynode/server.rb
 - lib/webbynode/ssh.rb
 - lib/webbynode/ssh_keys.rb
+- lib/webbynode/updater.rb
 - spec/fixtures/aliases
 - spec/fixtures/api/credentials
 - spec/fixtures/api/dns
@@ -228,6 +232,7 @@ files:
 - spec/webbynode/commands/add_backup_spec.rb
 - spec/webbynode/commands/add_key_spec.rb
 - spec/webbynode/commands/alias_spec.rb
+- spec/webbynode/commands/apps_spec.rb
 - spec/webbynode/commands/change_dns_spec.rb
 - spec/webbynode/commands/config_spec.rb
 - spec/webbynode/commands/delete_spec.rb