webbynode 1.0.5.3 → 1.1.0.beta1

data/.autotest

@@ -0,0 +1 @@
+require 'autotest/bundler'

data/.bundle/config

@@ -0,0 +1,2 @@
+--- {}
+

data/.gitignore

@@ -0,0 +1,4 @@
+.webbynode
+.pushand
+pkg
+*.gem

data/.rvmrc

@@ -0,0 +1 @@
+rvm ruby-1.9.3-p327@webbynode --create

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.9.3
+  - ree
+  - 1.8.7
+notifications:
+  recipients:
+    - felipe.coury@gmail.com
+  irc:
+    - "irc.freenode.org#webbynode"

data/Gemfile

@@ -1,22 +1,3 @@
 source :rubygems
 
-gem 'domainatrix'
-gem 'highline'
-gem 'httparty',           '~> 0.7.4'
-gem 'net-ssh',            '= 2.1.0'
-gem 'taps',               '0.3.23'
-gem 'webbynode-rainbow',  '~> 1.1.3'
-
-group :development do
-  gem 'rspec'
-  gem 'growl'
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'ZenTest'
-  gem 'autotest-growl'
-  gem 'database_cleaner'
-  gem 'awesome_print'
-  gem 'fakeweb'
-  gem 'echoe'
-  gem 'rcov'
-end
+gemspec

data/Gemfile.lock

@@ -1,67 +1,66 @@
+PATH
+  remote: .
+  specs:
+    webbynode (1.1.0)
+      domainatrix (~> 0.0.7)
+      highline (~> 1.6.1)
+      httparty (~> 0.7.4)
+      net-ssh (= 2.1.0)
+      sqlite3 (~> 1.3.4)
+      taps (~> 0.3.23)
+      webbynode-rainbow (~> 1.1.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
-    addressable (2.2.4)
-    allison (2.0.3)
+    addressable (2.3.2)
     autotest-growl (0.2.9)
     awesome_print (0.3.2)
     configuration (1.2.0)
     crack (0.1.8)
-    database_cleaner (0.6.4)
-    diff-lcs (1.1.2)
-    domainatrix (0.0.7)
+    diff-lcs (1.1.3)
+    domainatrix (0.0.11)
       addressable
-    echoe (4.5.6)
-      allison
-      gemcutter
-      rubyforge
     fakeweb (1.3.0)
-    gemcutter (0.7.0)
-    growl (1.0.3)
     guard (0.3.0)
       open_gem (~> 1.4.2)
       thor (~> 0.14.6)
     guard-rspec (0.1.9)
       guard (>= 0.2.2)
-    highline (1.6.1)
-    httparty (0.7.4)
+    highline (1.6.15)
+    httparty (0.7.8)
       crack (= 0.1.8)
-    json_pure (1.5.3)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    mime-types (1.16)
+    mime-types (1.19)
     net-ssh (2.1.0)
     open_gem (1.4.2)
       launchy (~> 0.3.5)
-    rack (1.3.2)
-    rake (0.8.7)
+    rack (1.4.1)
+    rake (10.0.2)
+    rb-fsevent (0.9.2)
     rcov (0.9.9)
-    rest-client (1.6.3)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
     sequel (3.20.0)
     sinatra (1.0)
       rack (>= 1.0)
-    sqlite3 (1.3.4)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    taps (0.3.23)
+    sqlite3 (1.3.6)
+    taps (0.3.24)
       rack (>= 1.0.1)
       rest-client (>= 1.4.0, < 1.7.0)
       sequel (~> 3.20.0)
       sinatra (~> 1.0.0)
-      sqlite3-ruby (~> 1.2)
     thor (0.14.6)
     webbynode-rainbow (1.1.3)
 
@@ -69,20 +68,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest
-  autotest-growl
-  awesome_print
-  database_cleaner
-  domainatrix
-  echoe
-  fakeweb
-  growl
-  guard
-  guard-rspec
-  highline
-  httparty (~> 0.7.4)
-  net-ssh (= 2.1.0)
-  rcov
-  rspec
-  taps (= 0.3.23)
-  webbynode-rainbow (~> 1.1.3)
+  ZenTest (~> 4.5.0)
+  autotest-growl (~> 0.2.9)
+  awesome_print (~> 0.3.2)
+  fakeweb (~> 1.3.0)
+  guard (~> 0.3.0)
+  guard-rspec (~> 0.1.9)
+  rake (~> 10.0.2)
+  rb-fsevent (~> 0.9.2)
+  rcov (~> 0.9.9)
+  rspec (~> 2.12.0)
+  webbynode!

data/Manifest

@@ -158,4 +158,3 @@ spec/webbynode/server_spec.rb
 spec/webbynode/ssh_spec.rb
 spec/webbynode/taps_spec.rb
 spec/webbynode/trial_spec.rb
-webbynode.gemspec

data/Rakefile

@@ -1,51 +1,7 @@
 require 'rubygems'
-require 'rake'
+require 'rake'  
 require 'rake/testtask'
 
-require 'echoe'
-
-Echoe.new('webbynode', '1.0.5.3') do |p|
-  p.description     = "Webbynode Deployment Gem"
-  p.url             = "http://webbynode.com"
-  p.author          = "Felipe Coury"
-  p.email           = "felipe@webbynode.com"
-  p.ignore_pattern  = ["tmp/*", "script/*"]
-  p.dependencies = [
-    ['bundler', '>=0.9.26'],
-    ['net-ssh', '=2.1.0'],
-    ['taps', '~>0.3.19'],
-    ['highline', '>=1.5.2'],
-    ['httparty', '~>0.7.4'],
-    ['launchy',  '>=0.3.7'],
-    ['domainatrix','>=0.0.7'],
-    ['webbynode-rainbow','~>1.1.3'],
-  ]
-  # p.dependencies = [
-  #   ['activeresource','>= 2.3.4'],
-  #   ['activesupport','>= 2.3.4'],
-  #   ['rainbow', '>=1.0.4'],
-  #   ['highline', '>=1.5.1'],
-  #   ['httparty', '>=0.4.5']
-  # ]
-  p.install_message = "
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-      Webbynode Rapid Deployment Gem
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-Thank you for installing Webbynode gem. You're now
-able to deploy and manage your applications from
-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
-
 require 'rspec/core/rake_task'
 
 desc 'Default: run specs.'

data/lib/webbynode/api_client.rb

@@ -1,76 +1,53 @@
 module Webbynode
   class ApiClient
     include HTTParty
-    base_uri "https://manager.webbynode.com/api/yaml"
-
     CREDENTIALS_FILE = "#{Io.home_dir}/.webbynode"
 
     Unauthorized = Class.new(StandardError)
     InactiveZone = Class.new(StandardError)
     ApiError = Class.new(StandardError)
-    
+
     def io
       @io ||= Io.new
     end
-    
-    def zones
-      response = post("/dns")
-      if zones = response["zones"]
-        zones.inject({}) { |h, zone| h[zone[:domain]] = zone; h }
-      end
+
+    def self.system
+      ApiClient.new.credentials['system']
     end
-    
-    def create_record(record, ip)
-      original_record = record
 
-      url = Domainatrix.parse("http://#{record}")
-      record = url.subdomain
-      domain = "#{url.domain}.#{url.public_suffix}."
-      
-      zone = zones[domain]
-      if zone
-        raise InactiveZone, domain unless zone[:status] == 'Active'
+    def self.instance
+      instance_for(system)
+    end
+
+    def self.instance_for(system)
+      if system == "manager2"
+        Manager2ApiClient.new
       else
-        zone = create_zone(domain)
+        ManagerApiClient.new
       end
-
-      create_a_record(zone[:id], record, ip, original_record)
     end
     
-    def create_zone(zone)
-      response = post("/dns/new", :query => {"zone[domain]" => zone, "zone[ttl]" => "86400"})
-      handle_error(response)
-      response
-    end
-    
-    def create_a_record(id, record, ip, original_record)
-      response = post("/dns/#{id}/records/new", :query => {"record[name]" => record, "record[type]" => "A", "record[data]" => ip})
-      if response["errors"] and response["errors"] =~ /Data has already been taken/
-        io.log "'#{original_record}' is already setup on Webbynode DNS, make sure it's pointing to #{ip}", :warning
-        return
+    def ip_for(hostname)
+      if webby = webbies[hostname]
+        webby.ip
       end
-      
-      handle_error(response)
-      response["record"]
     end
     
     def handle_error(response)
       raise ApiError, response["error"] if response["error"]
+      raise ApiError, format_error(response["errors"]) if response["errors"]
       raise ApiError, "invalid response from the API (code #{response.code})" unless response.code == 200
     end
-    
-    def ip_for(hostname)
-      (webbies[hostname] || {})['ip']
-    end
-    
-    def webbies
-      unless @webbies
-        response = post("/webbies") || {}
-        
-        @webbies = response
+
+    def format_error(error_hash)
+      output = []
+      error_hash.each_pair do |field, errors|
+        errors.each do |error|
+          output << "#{field} #{error}"
+        end
       end
-      
-      @webbies['webbies'].inject({}) { |h, webby| h[webby['name']] = webby; h }
+
+      output.join(", ")
     end
     
     def credentials
@@ -81,39 +58,34 @@ module Webbynode
       creds = if io.file_exists?(CREDENTIALS_FILE) and !overwrite
         properties
       else
+        system = overwrite[:system] if overwrite.is_a?(Hash) and overwrite[:system] 
         email = overwrite[:email] if overwrite.is_a?(Hash) and overwrite[:email]
         token = overwrite[:token] if overwrite.is_a?(Hash) and overwrite[:token]
         
-        io.log io.read_from_template("api_token") unless email and token
+        io.log io.read_from_template("api_token") unless email and token and system
+
+        system ||= ask("What's the end point you're using - manager or manager2? ")
+        email  ||= ask("Login email: ")
+        token  ||= ask("API token:   ")
 
-        email ||= ask("Login email: ")
-        token ||= ask("API token:   ")
+        puts ""
         
-        response = self.class.post("/webbies", :body => { :email => email, :token => token })
+        response = ApiClient.instance_for(system).check_auth(email, token)
         if response.code == 401 or response.code == 411
           raise Unauthorized, "You have provided the wrong credentials"
         end
 
         properties['email'] = email
         properties['token'] = token
+        properties['system'] = system
         properties.save
         
-        puts
-
-        { :email => email, :token => token }
+        { :email => email, :token => token, :system => system }
       end
     end
     
     def properties
       @properties ||= Webbynode::Properties.new(CREDENTIALS_FILE)
     end
-    
-    def post(uri, options={})
-      response = self.class.post(uri, { :body => credentials }.merge(options))
-      if response.code == 401 or response.code == 411
-        raise Unauthorized, "You have provided the wrong credentials"
-      end
-      response
-    end
   end
 end

data/lib/webbynode/command.rb

@@ -213,7 +213,7 @@ module Webbynode
     end
     
     def api
-      @@api ||= Webbynode::ApiClient.new
+      @@api ||= ApiClient.instance
     end
     
     def notify(msg)
@@ -267,6 +267,7 @@ module Webbynode
       end
       
       begin
+        @@api = ApiClient.instance
         validate_initialization if settings[:requires_initialization!]
         validate_options        if settings[:requires_options!]
         execute

data/lib/webbynode/commands/accounts.rb

@@ -24,7 +24,7 @@ module Webbynode::Commands
     
     def missing_target?
       unless io.file_exists?(target)
-        io.log "Account alias #{param(:name).color(:yellow)} not found. Use #{"wn account list".color(:white).bright} for a full list."
+        io.log "Account alias #{param(:name).bright} not found. Use #{"wn account list".bright} for a full list."
         return true
       end      
     end
@@ -35,7 +35,7 @@ module Webbynode::Commands
     
     def default
       credentials = api.credentials
-      io.log "Current account: #{credentials["email"].color(:yellow)}"
+      io.log "Current account: #{credentials["email"].bright}"
     end
     
     def list
@@ -46,11 +46,14 @@ module Webbynode::Commands
         return
       end
       
-      current = api.credentials["email"]
+      current_email  = api.credentials["email"]
+      current_system = api.credentials["system"]
       files.each do |f|
         if f =~ /\.webbynode_(.*)/
-          mark = io.file_matches(f, /email=#{current}/) ? "* " : "  "
-          io.log "#{mark.color(:yellow)}#{$1.color(:white).bright}"
+          current = io.file_matches(f, /email=#{current_email}/) 
+          current = current && io.file_matches(f, /system=#{current_system}$/)
+          mark = current ? "* " : "  "
+          io.log "#{mark.bright}#{$1}"
         end
       end
     end
@@ -68,7 +71,7 @@ module Webbynode::Commands
       return if missing_target?
       io.copy_file target, "#{Prefix}"
       account_alias = param(:name).dup
-      io.log "Successfully switched to account alias #{account_alias.color(:yellow)}."
+      io.log "Successfully switched to account alias #{account_alias.bright}."
     end
     
     def new
@@ -84,12 +87,12 @@ module Webbynode::Commands
       return if missing_target?
 
       if io.file_exists?("#{Prefix}_#{param(:new_name)}")
-        io.log "Account alias #{param(:new_name).color(:yellow)} already exists, use #{"wn account delete".color(:white).bright} to remove it first."
+        io.log "Account alias #{param(:new_name).bright} already exists, use #{"wn account delete".bright} to remove it first."
         return
       end
       
       io.rename_file "#{Prefix}_#{param(:name)}", "#{Prefix}_#{param(:new_name)}"
-      io.log "Account alias #{param(:name).color(:yellow)} successfully renamed to #{param(:new_name).color(:yellow)}."
+      io.log "Account alias #{param(:name).bright} successfully renamed to #{param(:new_name).bright}."
     end
   end
 end

data/lib/webbynode/commands/change_dns.rb

@@ -30,7 +30,7 @@ module Webbynode::Commands
 
       io.log "Your application will start responding to #{param(:dns_entry)} after next deployment."
     rescue Webbynode::ApiClient::InactiveZone
-      io.log "Domain #{$!.message.color(:yellow)} already setup on Webbynode DNS, but it's inactive."
+      io.log "Domain #{$!.message.bright} already setup on Webbynode DNS, but it's inactive."
       io.log "Please reactivate it and try again."
     end
   end

data/lib/webbynode/commands/database.rb

@@ -11,7 +11,7 @@ module Webbynode::Commands
     attr_reader :db
     
     def default
-      io.log "Missing action: use #{"pull".color(:yellow)}, #{"push".color(:yellow)} or #{"config".color(:yellow)}. For more help use #{"#{File.basename $0} help database".color(:yellow)}."
+      io.log "Missing action: use #{"pull".bright}, #{"push".bright} or #{"config".bright}. For more help use #{"#{File.basename $0} help database".bright}."
     end
     
     def pull
@@ -59,16 +59,16 @@ module Webbynode::Commands
           :remote_ip    => ip)
       rescue TapsError
         if $!.message =~ /LoadError: no such file to load -- (.*)/
-          io.log "#{"ERROR:".color(:red)} Missing database adapter. You need to install #{$1.color(:yellow)} gem to handle your database."
+          io.log "#{"ERROR:".bright} Missing database adapter. You need to install #{$1.bright} gem to handle your database."
         elsif $!.message =~ /Mysql::Error: Unknown database '(.*)'/
-          io.log "#{"ERROR:".color(:red)} Unknown database #{$1.color(:yellow)}. Create the local database and try again."
+          io.log "#{"ERROR:".bright} Unknown database #{$1.bright}. Create the local database and try again."
         elsif $!.message =~ /Sequel::DatabaseConnectionError -\> Mysql::Error: (.*)/
-          io.log "#{"ERROR:".color(:red)} Invalid MySQL credentials for your local database (#{$1})"
+          io.log "#{"ERROR:".bright} Invalid MySQL credentials for your local database (#{$1})"
         else
           if $!.message =~ /(.*) -\> (.*)/
-            io.log "#{"ERROR:".color(:red)} Unexpected error - #{$2}"
+            io.log "#{"ERROR:".bright} Unexpected error - #{$2}"
           else
-            io.log "#{"ERROR:".color(:red)} Unexpected error - #{$!.message}"
+            io.log "#{"ERROR:".bright} Unexpected error - #{$!.message}"
           end
         end
       ensure
@@ -93,7 +93,7 @@ module Webbynode::Commands
     
     def ask_db_credentials(force=false)
       retrieve_db_credentials
-      
+
       if force || db[:name].nil?
         db[:name] = query("Database name", db[:name] || io.db_name)
         db[:user] = query("    User name", db[:user] || io.db_name)

data/lib/webbynode/commands/dns_aliases.rb

@@ -22,9 +22,9 @@ module Webbynode::Commands
     
     def show
       if aliases.any?
-        io.log("Current aliases: #{aliases.join(' ').color(:yellow)}")
+        io.log("Current aliases: #{aliases.join(' ').bright}")
       else
-        io.log("No current aliases. To add new aliases use:\n\n  #{"#{File.basename $0} dns_aliases add ".color(:yellow)}new-dns-alias")
+        io.log("No current aliases. To add new aliases use:\n\n  #{"#{File.basename $0} dns_aliases add ".bright}new-dns-alias")
       end
     end
     
@@ -32,12 +32,12 @@ module Webbynode::Commands
       new_alias = param(:alias)
       
       if aliases.include?(new_alias)
-        io.log "Alias #{new_alias.color(:yellow)} already exists."
+        io.log "Alias #{new_alias.bright} already exists."
       else
         aliases << new_alias
         save_aliases
 
-        io.log "Alias #{new_alias.color(:yellow)} added."
+        io.log "Alias #{new_alias.bright} added."
         show
       end
     end
@@ -49,10 +49,10 @@ module Webbynode::Commands
         aliases.delete to_remove
         save_aliases
 
-        io.log "Alias #{to_remove.color(:yellow)} removed."
+        io.log "Alias #{to_remove.bright} removed."
         show
       else
-        io.log "Alias #{to_remove.color(:yellow)} doesn't exist."
+        io.log "Alias #{to_remove.bright} doesn't exist."
       end
     end
     

data/lib/webbynode/commands/{guides.rb → docs.rb}

@@ -1,8 +1,9 @@
 require 'launchy'
 
 module Webbynode::Commands
-  class Guides < Webbynode::Command
-    summary "Opens the Rapp Guides in your browser"
+  class Docs < Webbynode::Command
+    summary "Opens Webbynode Documentation in your browser"
+    add_alias "guides"
    
     def execute
       Launchy.open "http://wbno.de/rapp"

data/lib/webbynode/commands/help.rb

@@ -5,7 +5,7 @@ module Webbynode::Commands
     
     def execute
       if param(:command) == "commands"
-        puts "usage: #{"webbynode".color(:white).bright} #{"COMMAND".color(:green)}"
+        puts "usage: #{"webbynode".bright} #{"COMMAND".bright}"
         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(15).color(:green)} #{Webbynode::Command.class_for(command).setting(:summary)}"
+          puts "    #{command.ljust(15).bright} #{Webbynode::Command.class_for(command).setting(:summary)}"
         end
         puts 
-        puts "Try '#{"webbynode help".color(:white).bright} #{"COMMAND".color(:green)}' for more information."
+        puts "Try '#{"webbynode help".bright} #{"COMMAND".bright}' for more information."
       else
         kls = Help.for(param(:command))
         if kls