webbynode 1.0.5.3 → 1.1.0.beta1

data/spec/fixtures/manager2/webbies_unauthorized

@@ -0,0 +1,10 @@
+HTTP/1.1 401 Unauthorized
+Content-Type: application/json; charset=utf-8
+X-UA-Compatible: IE=Edge
+Cache-Control: no-cache
+Set-Cookie: _manager2_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRkkiJTZlMmIzMmU2YjU0ZWFkYTAzMzEzNzExNzdiNTZkMjgxBjsAVA%3D%3D--c63c0ee5af07938f9c01ea6f879cec2667a67fae; path=/; HttpOnly
+X-Request-Id: ff212d338f2fe110fb7498c67804e488
+X-Runtime: 0.009122
+Transfer-Encoding: chunked
+
+{"error":"Invalid authentication token"}

data/spec/fixtures/manager2/zones

@@ -0,0 +1,11 @@
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=utf-8
+X-UA-Compatible: IE=Edge
+ETag: "008c38dc8bf529335cf627ec2f9116e7"
+Cache-Control: max-age=0, private, must-revalidate
+Set-Cookie: _manager2_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTNiZDM1NDc1OTJhYjc1ZGYxYTBkYzlhZGQ4ZTEwNGIyBjsAVEkiGXdhcmRlbi51c2VyLnVzZXIua2V5BjsAVFsISSIJVXNlcgY7AEZbBmkCpRMw--26cedef41c3bfe0db351c6a0d9d75481bbe41f05; path=/; HttpOnly
+X-Request-Id: bb9dcb0d5162114f44a121537a9cb066
+X-Runtime: 0.237234
+Transfer-Encoding: chunked
+
+[{"id":18,"name":"developer.com"},{"id":20,"name":"rubyista.info"},{"id":21,"name":"webbyapp.com"}]

data/spec/fixtures/manager2/zones_a_record

@@ -0,0 +1,11 @@
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=utf-8
+X-UA-Compatible: IE=Edge
+ETag: "894d43b42f734d4b3cd3a49665d50340"
+Cache-Control: max-age=0, private, must-revalidate
+Set-Cookie: _manager2_session=BAh7B0kiGXdhcmRlbi51c2VyLnVzZXIua2V5BjoGRVRbCEkiCVVzZXIGOwBGWwZpAqUTMEkiD3Nlc3Npb25faWQGOwBGSSIlZDU1ZmNiYjU0ZWUxNDdjNjM0Yjg5NDhkM2MxMTA4YjAGOwBU--6d20062fe58981c5c9ba2e9f5b72dac8052fc457; path=/; HttpOnly
+X-Request-Id: 5dd616dacff6bafdd1f7adb6318fc8be
+X-Runtime: 0.623106
+Transfer-Encoding: chunked
+
+{"id":32,"name":"ww3","type":"A","content":"102.10.87.111","ttl":3600,"aux":0}

data/spec/fixtures/manager2/zones_a_record_error

@@ -0,0 +1,10 @@
+HTTP/1.1 404 Not Found
+Content-Type: application/json; charset=utf-8
+X-UA-Compatible: IE=Edge
+Cache-Control: no-cache
+Set-Cookie: _manager2_session=BAh7B0kiGXdhcmRlbi51c2VyLnVzZXIua2V5BjoGRVRbCEkiCVVzZXIGOwBGWwZpAqUTMEkiD3Nlc3Npb25faWQGOwBGSSIlZTRiZGVjYmM5YTk4NDUxNzMxNGYxM2I3YTFmMzNiNTIGOwBU--a889bbab4b1fd9fd4c2887e871ca5e6739760f2c; path=/; HttpOnly
+X-Request-Id: 4878cb8eeca3a4395ff86ebffb30be2e
+X-Runtime: 0.569462
+Transfer-Encoding: chunked
+
+{"message":"not found"}

data/spec/fixtures/manager2/zones_new_zone

@@ -0,0 +1,11 @@
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=utf-8
+X-UA-Compatible: IE=Edge
+ETag: "c2f2bd693271cea091c60e9d46ccfb4b"
+Cache-Control: max-age=0, private, must-revalidate
+Set-Cookie: _manager2_session=BAh7B0kiGXdhcmRlbi51c2VyLnVzZXIua2V5BjoGRVRbCEkiCVVzZXIGOwBGWwZpAqUTMEkiD3Nlc3Npb25faWQGOwBGSSIlYmYxYzExZDU1OWRiMjgwMWJlYjAxNzAzMDJmMTlmYTIGOwBU--a6bc9a95f4359db2c22f1a86fbb68db4445818cf; path=/; HttpOnly
+X-Request-Id: 07e9ed44c58cafdd3c77b6cee1da0061
+X-Runtime: 0.080832
+Transfer-Encoding: chunked
+
+{"id":22,"name":"newzone.com"}

data/spec/spec_helper.rb

@@ -51,6 +51,7 @@ RSpec.configure do |config|
   config.before(:each) do
     @orig_stdout = $stdout
     $stdout = StringIO.new
+    Webbynode::ApiClient.stub(:instance)
   end
   
   config.after(:each) do

data/spec/webbynode/api_client_spec.rb

@@ -4,149 +4,31 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'spec_helper')
 describe Webbynode::ApiClient do
   let(:base_uri) { Webbynode::ApiClient.base_uri }
   let(:api)      { Webbynode::ApiClient.new }
-  
-  before(:each) do
-    FakeWeb.clean_registry
-  end
-  
-  describe "#create_record" do
-    it "should raise an exception if the domain is inactive" do
-      api.should_receive(:zones).and_return({"another.com." => {:id => 21, :status => "Inactive"}})
-      api.should_receive(:create_zone).never
-      api.should_receive(:create_a_record).never
-      
-      lambda { api.create_record("yes.another.com", "10.0.0.0") }.should raise_error(Webbynode::ApiClient::InactiveZone, "another.com.")
-    end
 
-    it "should create the domain, when inexistent" do
-      api.should_receive(:zones).and_return({})
-      api.should_receive(:create_zone).with("newdomain.com.").and_return({:id => 20, :status => 'Active'})
-      api.should_receive(:create_a_record).with(20, "new", "212.10.20.10", "new.newdomain.com")
-      
-      api.create_record("new.newdomain.com", "212.10.20.10")
-    end
-
-    it "should retrieve the domains, when inexistent" do
-      api.should_receive(:zones).and_return({"mydomain.com.br." => {:id => 21, :status => 'Active'}})
-      api.should_receive(:create_a_record).with(21, "new", "212.10.20.10", "new.mydomain.com.br")
-      
-      api.create_record("new.mydomain.com.br", "212.10.20.10")
-    end
+  before(:all) do
+    Webbynode::ApiClient.send(:base_uri, "https://manager.webbynode.com/api/yaml")
   end
   
-  describe "#zones" do
-    it "should return all the zones" do
-      FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/dns", 
-        :email => "fcoury@me.com", :response => read_fixture("api/dns"))
-      
-      api.should_receive(:init_credentials).and_return({:email => "fcoury@me.com", :token => "apitoken"})
-      api.zones["rubyista.info."][:domain].should == "rubyista.info."
-      api.zones["webbyapp.com."][:domain].should == "webbyapp.com."
-    end
-  end
-  
-  describe "#create_zone" do
-    it "should create a new zone and a new A record" do
-      FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/dns", 
-        :email => "fcoury@me.com", :response => read_fixture("api/dns"))
-        
-      FakeWeb.register_uri(:post, 
-        "#{Webbynode::ApiClient.base_uri}/dns/new?zone[ttl]=86400&zone[domain]=newzone.com.", 
-        :email => "fcoury@me.com", :response => read_fixture("api/dns_new_zone"))
-     
-      api.should_receive(:init_credentials).and_return({:email => "fcoury@me.com", :token => "apitoken"})
-      api.create_zone("newzone.com.")[:id].should == 1045
-    end
-  end
-  
-  describe "#create_a_record" do
-    it "should create a new A record" do
-      FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/dns", 
-        :email => "fcoury@me.com", :response => read_fixture("api/dns"))
-        
-      FakeWeb.register_uri(:post, 
-        "#{Webbynode::ApiClient.base_uri}/dns/14/records/new?record[data]=200.100.200.100&record[type]=A&record[name]=xyz", 
-        :email => "fcoury@me.com", :response => read_fixture("api/dns_a_record"))
-     
-      api.should_receive(:init_credentials).and_return({:email => "fcoury@me.com", :token => "apitoken"})
-      api.create_a_record(14, "xyz", "200.100.200.100", "xyz.rubyista.info")[:id].should == 7360
-    end
-
-    it "raise an exception upon errors" do
-      FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/dns", 
-        :email => "fcoury@me.com", :response => read_fixture("api/dns"))
-        
-      FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/dns/14/records/new?record[data]=200.100.200.100&record[type]=A&record[name]=xyz", 
-        :email => "fcoury@me.com", :response => read_fixture("api/dns_a_record_error"))
-     
-      api.should_receive(:init_credentials).and_return({:email => "fcoury@me.com", :token => "apitoken"})
-      lambda { 
-        api.create_a_record(14, "xyz", "200.100.200.100", "xyz.rubyista.info") 
-      }.should raise_error(Webbynode::ApiClient::ApiError, "No DNS entry for id 99999")
-    end
-  end
-
-  describe "#ip_for" do
-    describe "when file ~/.webbynode is absent" do
-      it "should call init_credentials email address and API token" do
-        FakeWeb.register_uri(:post, "#{base_uri}/webbies", 
-          :email => "fcoury@me.com", :response => read_fixture("api/webbies"))
-
-        api.should_receive(:init_credentials).and_return({:email => "fcoury@me.com", :token => "apitoken"})
-        api.ip_for("webby3067").should == "61.21.71.31"
-      end
-
-      it "should return the correct ip" do
-        FakeWeb.register_uri(:post, "#{base_uri}/webbies", 
-          :email => "fcoury@me.com", :response => read_fixture("api/webbies"))
-
-        api.should_receive(:init_credentials).and_return({:email => "fcoury@me.com", :token => "apitoken"})
-        api.ip_for("sandbox").should == "201.81.121.201"
-      end
-    end
-
-    describe "when file ~/.webbynode is present" do
-      before do
-        FakeWeb.register_uri(:post, "#{base_uri}/webbies", 
-          :email => "fcoury@me.com", :response => read_fixture("api/webbies"))
-      end
-
-      it "should return the IP for existing Webby hostname" do
-        api.should_receive(:credentials).and_return({:email => "fcoury@me.com", :token => "apitoken"})
-        api.ip_for("sandbox").should == "201.81.121.201"
-      end
-
-      it "should show an error message if the Webby does not exist for the user" do
-        api.should_receive(:credentials).and_return({:email => "fcoury@me.com", :token => "apitoken"})
-        api.ip_for("this_doesnt_exist").nil?.should == true
-      end
-    end
-  end
-
-  describe "when unauthorized" do
-    it "should raise an error" do
-      FakeWeb.register_uri(:post, "#{base_uri}/webbies", 
-        :email => "fcoury@me.com", :response => read_fixture("api/webbies_unauthorized"))
-
-      api = Webbynode::ApiClient.new
-      api.should_receive(:credentials).and_return({:email => "fcoury@me.com"})
-      lambda { api.ip_for("sandbox") }.should raise_error(Webbynode::ApiClient::Unauthorized, "You have provided the wrong credentials")
-    end
+  before(:each) do
+    FakeWeb.clean_registry
   end
   
   describe "#init_credentials" do
     let(:io) { double("Io") }
+    let(:post_result) { stub(:post_result).as_null_object }
 
     before(:each) do
       api.should_receive(:io).any_number_of_times.and_return(io)
+      # Webbynode::ApiClient.stub(:post => post_result)
     end
     
     context "when credentials file exists" do
       it "should read the credentials" do
         io.should_receive(:file_exists?).with("#{ENV['HOME']}/.webbynode").and_return(true)
-        api.should_receive(:properties).and_return({:email => "fcoury@me.com", :token => "apitoken"})
+        api.should_receive(:properties).and_return({:email => "fcoury@me.com", :token => "apitoken", :system => 'manager'})
 
         creds = api.init_credentials
+        creds[:system].should == "manager"
         creds[:email].should == "fcoury@me.com"
         creds[:token].should == "apitoken"
       end
@@ -162,12 +44,14 @@ describe Webbynode::ApiClient do
         io.should_receive(:read_from_template)
         api.should_receive(:properties).any_number_of_times.and_return(properties)
         
+        api.should_receive(:ask).once.ordered.and_return("manager")
         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[:system].should == "manager"
         creds[:email].should == "login@email.com"
         creds[:token].should == "apitoken"
       end
@@ -184,7 +68,8 @@ describe Webbynode::ApiClient do
           
         api.should_receive(:ask).never
         
-        creds = api.init_credentials({ :email => 'login@email.com', :token => 'apitoken' })
+        creds = api.init_credentials({ :email => 'login@email.com', :token => 'apitoken', :system => 'manager' })
+        creds[:system].should == "manager"
         creds[:email].should == "login@email.com"
         creds[:token].should == "apitoken"
       end
@@ -202,6 +87,7 @@ describe Webbynode::ApiClient do
         io.should_receive(:read_from_template)
         api.should_receive(:properties).any_number_of_times.and_return(properties)
 
+        api.should_receive(:ask).once.ordered.and_return("manager")
         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")
         
@@ -221,11 +107,12 @@ describe Webbynode::ApiClient do
         io.should_receive(:read_from_template)
         api.should_receive(:properties).any_number_of_times.and_return(properties)
         
+        api.should_receive(:ask).once.ordered.and_return("manager")
         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
     end

data/spec/webbynode/command_spec.rb

@@ -53,6 +53,10 @@ describe Webbynode::Command do
     end
     
     context "when git is missing" do
+      before do
+        Webbynode::ApiClient.stub(:instance)
+      end
+
       it "should provide a friendly error" do
         git.should_receive(:present?).and_return(false)
         
@@ -214,6 +218,8 @@ describe Webbynode::Command do
         raise Webbynode::ApiClient::Unauthorized
       end
     end
+
+    before { Webbynode::ApiClient.stub(:instance) }
     
     it "should output a friendly message" do
       cmd = UnauthorizedCommand.new

data/spec/webbynode/commands/accounts_spec.rb

@@ -17,12 +17,18 @@ describe Webbynode::Commands::Accounts do
     subject { prepare "list" }
 
     it "shows all available accounts" do
-      api.should_receive(:credentials).and_return({"email" => "fcoury@me.com", "token" => "apitoken"})
-      io.should_receive(:list_files).with("#{dir}/.webbynode_*").and_return(["#{dir}/.webbynode_personal", "#{dir}/.webbynode_biz"])
-      io.should_receive(:file_matches).with("#{dir}/.webbynode_personal", /email=fcoury@me.com/).and_return(true)
-      io.should_receive(:file_matches).with("#{dir}/.webbynode_biz", /email=fcoury@me.com/).and_return(false)
+      api.stub(:credentials => {"email" => "fcoury@me.com", "token" => "apitoken", "system" => "manager"})
+      io.stub(:list_files).with("#{dir}/.webbynode_*").and_return(["#{dir}/.webbynode_personal", "#{dir}/.webbynode_biz", "#{dir}/.webbynode_other"])
+      io.stub(:file_matches).with("#{dir}/.webbynode_personal", /email=fcoury@me.com/).and_return(true)
+      io.stub(:file_matches).with("#{dir}/.webbynode_personal", /system=manager$/).and_return(true)
+      io.stub(:file_matches).with("#{dir}/.webbynode_other", /email=fcoury@me.com/).and_return(true)
+      io.stub(:file_matches).with("#{dir}/.webbynode_other", /system=manager$/).and_return(false)
+      io.stub(:file_matches).with("#{dir}/.webbynode_biz", /email=fcoury@me.com/).and_return(false)
+      io.stub(:file_matches).with("#{dir}/.webbynode_biz", /system=manager$/).and_return(false)
+
       io.should_receive(:log).with("* personal")
       io.should_receive(:log).with("  biz")
+      io.should_receive(:log).with("  other")
       subject.execute
     end
     

data/spec/webbynode/commands/apps_spec.rb

@@ -11,6 +11,7 @@ describe Webbynode::Commands::Apps do
   end
   
   it "executes list_apps remotely" do
+    Webbynode::ApiClient.stub(:system => "manager")
     re.should_receive(:exec).with("list_apps", true)
     subject.execute
   end

data/spec/webbynode/commands/database_spec.rb

@@ -99,6 +99,7 @@ describe Webbynode::Commands::Database do
     
     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_user").and_return(nil)
       io.should_receive(:load_setting).with("database_password").and_return(nil)
       
       io.should_receive(:db_name).any_number_of_times.and_return("myapp")
@@ -114,6 +115,7 @@ describe Webbynode::Commands::Database do
     context "when user doesn't authorize" do
       it "stores all data but password" do
         io.should_receive(:load_setting).with("database_name").and_return(nil)
+        io.should_receive(:load_setting).with("database_user").and_return(nil)
         io.should_receive(:load_setting).with("database_password").and_return(nil)
         
         io.should_receive(:db_name).any_number_of_times.and_return("myapp")
@@ -134,9 +136,10 @@ describe Webbynode::Commands::Database do
     context "when user authorizes" do
       it "stores the password" do
         io.should_receive(:load_setting).with("database_name").and_return(nil)
+        io.should_receive(:load_setting).with("database_user").and_return(nil)
         io.should_receive(:load_setting).with("database_password").and_return(nil)
         
-        io.should_receive(:db_name).any_number_of_times.and_return("myapp")
+        io.stub(:db_name).any_number_of_times.and_return("myapp")
 
         subject.should_receive(:ask).with("Database name [myapp]: ").and_return("")
         subject.should_receive(:ask).with("    User name [myapp]: ").and_return("user")

data/spec/webbynode/commands/{guides_spec.rb → docs_spec.rb}

@@ -1,8 +1,8 @@
 # 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
+describe Webbynode::Commands::Docs do
+  it "opens docs in browser" do
     Launchy.should_receive(:open).with('http://wbno.de/rapp')
     subject.execute
   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) } }
   let(:api)         { double("api").as_null_object }
   let(:pushand)     { stub.as_null_object }
+  let(:instance)    { stub(:instance).as_null_object }
   
   def create_init(ip="4.3.2.1", host=nil, extra=[])
     host = "--dns=#{host}" if host
@@ -24,20 +25,27 @@ describe Webbynode::Commands::Init do
     FakeWeb.clean_registry
     create_init
     git_handler.stub!(:remote_exists?).and_return(false)
+    Webbynode::ApiClient.stub(:system => "manager")
+    Webbynode::ApiClient.stub(:instance => instance)
+  end
+
+  def make_webby(hash)
+    webby        = Webbynode::Webby.new
+    hash.each_pair { |k,v| webby.send("#{k}=", v) }
+    webby
   end
   
   subject do
     Webbynode::Commands::Init.new.tap do |cmd|
-      webbies = {
-        'sandbox' => {
-          "ip"     => "201.81.121.201",
-          "status" => "on",
-          "name"   => "sandbox",
-          "notes"  => "",
-          "plan"   => "Webbybeta",
-          "node"   => "miami-b15"
-        }
-      }
+      webby        = Webbynode::Webby.new
+      webby.ip     = "201.81.121.201"
+      webby.status = "on"
+      webby.name   = "sandbox"
+      webby.plan   = "Webbybeta"
+      webby.node   = "miami-b15"
+
+      webbies = { 'sandbox' => webby }
+
       api.stub!(:webbies).and_return(webbies)
 
       cmd.stub!(:git).and_return(git_handler)
@@ -82,7 +90,7 @@ describe Webbynode::Commands::Init do
     it "asks for trial username when not found" do
       io_handler.should_receive(:general_settings).and_return({})
       io_handler.should_receive(:app_name).and_return('trial_app')
-      subject.should_receive(:ask).with('Enter your Rapp trial user: ').and_return('user')
+      subject.should_receive(:ask).with('Enter your Webbynode trial user: ').and_return('user')
       io_handler.should_receive(:add_general_setting).with('rapp_username', 'user')
       git_handler.should_receive(:add_remote).with('user', 'webbynode', 'trial.webbyapp.com', 'trial_app', :home => '/home/user')
 
@@ -238,14 +246,13 @@ describe Webbynode::Commands::Init do
       subject do
         Webbynode::Commands::Init.new("--engine=php").tap do |cmd|
           webbies = {
-            'sandbox' => {
+            'sandbox' => make_webby({
               "ip"     => "201.81.121.201",
               "status" => "on",
               "name"   => "sandbox",
-              "notes"  => "",
               "plan"   => "Webbybeta",
               "node"   => "miami-b15"
-            }
+            })
           }
           api.stub!(:webbies).and_return(webbies)
 
@@ -319,30 +326,27 @@ describe Webbynode::Commands::Init do
     
     it "complains if missing and user has > 1 webby" do
       webbies = {
-        'webby3' => {
+        'webby3' => make_webby({
           "ip"     => "67.53.31.3",
           "status" => "on",
           "name"   => "webby3",
-          "notes"  => "",
           "plan"   => "Webbybeta",
           "node"   => "miami-b11"
-        },
-        'sandbox' => {
+        }),
+        'sandbox' => make_webby({
           "ip"     => "201.81.121.201",
           "status" => "on",
           "name"   => "sandbox",
-          "notes"  => "",
           "plan"   => "Webbybeta",
           "node"   => "miami-b15"
-        },
-        'webby2' => {
+        }),
+        'webby2' => make_webby({
           "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:")
@@ -519,47 +523,6 @@ describe Webbynode::Commands::Init do
     end
   end
   
-  it "should ask for user's login email if no credentials" do
-    FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/webbies", 
-      :email => "fcoury@me.com", :response => read_fixture("api/webbies"))
-
-    io_handler.should_receive(:file_exists?).with(Webbynode::ApiClient::CREDENTIALS_FILE).and_return(false)
-    io_handler.should_receive(:app_name).any_number_of_times.and_return("my_app")
-
-    props = {}
-    props.stub(:save)
-
-    create_init("my_webby_name")
-    @command.stub!(:detect_engine).and_return(Webbynode::Engines::Rails)
-    @command.api.should_receive(:io).any_number_of_times.and_return(io_handler)
-    @command.api.should_receive(:ask).with("API token:   ").and_return("234def")
-    @command.api.should_receive(:ask).with("Login email: ").and_return("abc123")
-    @command.api.should_receive(:properties).any_number_of_times.and_return(props)
-    api.stub(:puts)
-    @command.run
-    
-    stdout.should =~ /Couldn't find Webby 'my_webby_name' on your account. Your Webbies are/
-    stdout.should =~ /'webby3067'/
-    stdout.should =~ /' and '/
-    stdout.should =~ /'sandbox'/
-  end
-  
-  it "should report the error if user provides wrong credentials" do
-    FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/webbies", 
-      :email => "fcoury@me.com", :response => read_fixture("api/webbies_unauthorized"))
-
-    io_handler.should_receive(:app_name).any_number_of_times.and_return("my_app")
-    io_handler.should_receive(:create_file).never
-
-    create_init("my_webby_name")
-
-    @command.api.should_receive(:ip_for).and_raise(Webbynode::ApiClient::Unauthorized)
-    @command.stub!(:detect_engine).and_return(Webbynode::Engines::Rails)
-    @command.run
-
-    stdout.should =~ /Your credentials didn't match any Webbynode account./
-  end
-  
   it "should report Webby doesn't exist" do
     api = double("ApiClient")
     api.should_receive(:ip_for).with("my_webby_name").and_return(nil)

data/spec/webbynode/commands/push_spec.rb

@@ -16,6 +16,7 @@ describe Webbynode::Commands::Push do
     push.should_receive(:git).any_number_of_times.and_return(git)
     push.before_tasks.stub!(:read_tasks)
     push.after_tasks.stub!(:read_tasks)
+    Webbynode::ApiClient.stub(:system => "manager")
   end
   
   subject do
@@ -30,22 +31,35 @@ describe Webbynode::Commands::Push do
   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
+    context "with manager 2" do
+      it "doesn't check for updates" do
+        Webbynode::ApiClient.stub(:system => "manager2")
+        re.should_receive(:exec).with(/update_rapp/).never
+        subject.before_tasks.should_receive(:ensure_tasks_folder)
+        subject.before_tasks.should_receive(:read_tasks)
+        subject.execute
+      end
+    end
 
-      /var/webbynode/update_rapp
-      if [ $? -eq 1 ]; then exit 1; fi
-      EOS
-      
-      subject.before_tasks.should_receive(:ensure_tasks_folder)
-      subject.before_tasks.should_receive(:read_tasks)
-      subject.execute
+    context "with manager" do
+      it "checks for update_rapp script remotely" do
+        Webbynode::ApiClient.stub(:system => "manager")
+        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.before_tasks.should_receive(:ensure_tasks_folder)
+        subject.before_tasks.should_receive(:read_tasks)
+        subject.execute
+      end
     end
   end
   

data/spec/webbynode/commands/remote_spec.rb

@@ -2,6 +2,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'spec_helper')
 
 describe Webbynode::Commands::Remote do
+  let(:instance) { stub(:instance) }
   
   def load_all_mocks(rem=remote)
     rem.should_receive(:remote_executor).any_number_of_times.and_return(re)
@@ -9,6 +10,7 @@ describe Webbynode::Commands::Remote do
     rem.should_receive(:io).any_number_of_times.and_return(io)
     rem.should_receive(:pushand).any_number_of_times.and_return(pushand)
     rem.should_receive(:server).any_number_of_times.and_return(server)
+    Webbynode::ApiClient.stub(:instance => instance)
   end
   
   let(:re)      { double("RemoteExecutor").as_null_object }

data/spec/webbynode/commands/version_spec.rb

@@ -11,7 +11,7 @@ describe Webbynode::Commands::Version do
   end
   
   it "should return the version of the gem" do
-    io.should_receive(:log).with("Rapid Deployment Gem v#{Webbynode::VERSION}")
+    io.should_receive(:log).with("Rapid Deployment Gem v#{Webbynode::Version::STRING}")
     version.execute
   end
   

data/spec/webbynode/commands/webbies_spec.rb

@@ -7,12 +7,27 @@ describe Webbynode::Commands::Webbies do
   end
 
   it "should provide a list with all the Webbies and its status" do
-    FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/webbies", 
-      :email => "fcoury@me.com", :response => read_fixture("api/webbies"))
+    # FakeWeb.register_uri(:post, "#{Webbynode::ApiClient.base_uri}/webbies", 
+    #   :email => "fcoury@me.com", :response => read_fixture("api/webbies"))
     
+    webby1 = Webbynode::Webby.new
+    webby1.name = "sandbox"
+    webby1.ip = "201.81.121.201"
+    webby1.node = "miami-b15"
+    webby1.plan = "plan1"
+    webby1.status = "on"
+
+    webby2 = Webbynode::Webby.new
+    webby2.name = "webby3067"
+    webby2.ip = "61.21.71.31"
+    webby2.node = "miami-b02"
+    webby2.plan = "plan2"
+    webby2.status = "off"
+
     api = Webbynode::ApiClient.new
     api.stub(:properties)
     api.stub(:credentials)
+    api.stub(:webbies => { "sandbox" => webby1, "webby3067" => webby2 })
     
     cmd = Webbynode::Commands::Webbies.new
     cmd.should_receive(:api).and_return(api)