joyent 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/joyent

@@ -9,10 +9,10 @@ require File.join(File.dirname(__FILE__), '../lib/joyent')
 class JoyentCLI < Thor
   private
 
-  def get_connection
+  def get_connection(datacenter = Joyent::Datacenters.default)
     get_config unless load_config
 
-    Joyent::Connection.new(@username, @password)
+    Joyent::Connection.new(@username, @password, datacenter)
   end
 
   def load_config
@@ -121,8 +121,9 @@ class JoyentCLI < Thor
   # Machines
   #
   desc "list_machines", "list all of the machines on the account"
+  method_option :datacenter, :type => :string, :aliases => "-D", :default => Joyent::Datacenters.default
   def list_machines
-    conn = get_connection
+    conn = get_connection(options["datacenter"])
     conn.machines.list.each do |m|
       puts "#{m.name} [#{m.id}]: #{m.dataset} (#{m.state})"
     end
@@ -132,47 +133,53 @@ class JoyentCLI < Thor
   method_option :name, :type => :string, :aliases => "-n"
   method_option :package, :type => :string, :aliases => "-p"
   method_option :dataset, :type => :string, :aliases => "-d"
+  method_option :datacenter, :type => :string, :aliases => "-D", :default => Joyent::Datacenters.default
   def create_machine
-    conn = get_connection
+    conn = get_connection(options["datacenter"])
     m = conn.machines.create(options)
     puts "#{m.name}: #{m.dataset} (#{m.state})"
   end
 
   desc "stop_machine ID", "stops the machine with the given ID"
+  method_option :datacenter, :type => :string, :aliases => "-D", :default => Joyent::Datacenters.default
   def stop_machine(id)
-    conn = get_connection
+    conn = get_connection(options["datacenter"])
     m = conn.machines.get(id)
     m.stop
     puts "#{m.name} [#{m.id}] STOPPED"
   end
 
   desc "start_machine ID", "starts the machine with the given ID"
+  method_option :datacenter, :type => :string, :aliases => "-D", :default => Joyent::Datacenters.default
   def start_machine(id)
-    conn = get_connection
+    conn = get_connection(options["datacenter"])
     m = conn.machines.get(id)
     m.start
     puts "#{m.name} [#{m.id}] STARTED"
   end
 
   desc "reboot_machine ID", "reboots the machine with the given ID"
+  method_option :datacenter, :type => :string, :aliases => "-D", :default => Joyent::Datacenters.default
   def reboot_machine(id)
-    conn = get_connection
+    conn = get_connection(options["datacenter"])
     m = conn.machines.get(id)
     m.reboot
     puts "#{m.name} [#{m.id}] REBOOTED"
   end
 
   desc "resize_machine ID PACKAGE", "stops the machine with the given ID to the specified PACKAGE"
+  method_option :datacenter, :type => :string, :aliases => "-D", :default => Joyent::Datacenters.default
   def resize_machine(id, package)
-    conn = get_connection
+    conn = get_connection(options["datacenter"])
     m = conn.machines.get(id)
     m.resize(package)
     puts "#{m.name} [#{m.id}] RESIZED to #{package}"
   end
 
   desc "delete_machine ID", "deletes the machine with the given ID"
+  method_option :datacenter, :type => :string, :aliases => "-D", :default => Joyent::Datacenters.default
   def delete_machine(id)
-    conn = get_connection
+    conn = get_connection(options["datacenter"])
     m = conn.machines.get(id)
     m.delete
     puts "#{m.name} [#{m.id}] DELETED"

data/joyent.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{joyent}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Wyrosdick"]
-  s.date = %q{2011-09-29}
+  s.date = %q{2011-10-02}
   s.default_executable = %q{joyent}
   s.description = %q{Ruby interface to the joyent cloud API}
   s.email = %q{ben.wyrosdick@gmail.com}

data/lib/joyent/connection.rb

@@ -1,7 +1,7 @@
 module Joyent
   class Connection
-    def initialize(username, password)
-      @http_connection = Net::HTTP.new(Joyent::API_ENDPOINT, 443)
+    def initialize(username, password, datacenter = Datacenters.default)
+      @http_connection = Net::HTTP.new(datacenter, 443)
       @http_connection.use_ssl = true
       @http_connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
 

data/lib/joyent/datacenters.rb

@@ -4,6 +4,10 @@ module Joyent
       @connection = connection
     end
 
+    def self.default
+      Joyent::API_ENDPOINT
+    end
+
     def list
       @connection.execute(:get, "/datacenters").map{|name, url| Joyent::Datacenter.new(name, url)}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000 -07:00
+date: 2011-10-02 00:00:00.000000000 -07:00
 default_executable: joyent
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152071900 !ruby/object:Gem::Requirement
+  requirement: &2172690260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152071900
+  version_requirements: *2172690260
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152071420 !ruby/object:Gem::Requirement
+  requirement: &2172689780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152071420
+  version_requirements: *2172689780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152070940 !ruby/object:Gem::Requirement
+  requirement: &2172689300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152070940
+  version_requirements: *2172689300
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152070460 !ruby/object:Gem::Requirement
+  requirement: &2172688820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152070460
+  version_requirements: *2172688820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152069980 !ruby/object:Gem::Requirement
+  requirement: &2172705460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152069980
+  version_requirements: *2172705460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152085860 !ruby/object:Gem::Requirement
+  requirement: &2172704980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152085860
+  version_requirements: *2172704980
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152085380 !ruby/object:Gem::Requirement
+  requirement: &2172704500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152085380
+  version_requirements: *2172704500
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2152084900 !ruby/object:Gem::Requirement
+  requirement: &2172704020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152084900
+  version_requirements: *2172704020
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152084420 !ruby/object:Gem::Requirement
+  requirement: &2172703540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152084420
+  version_requirements: *2172703540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152083940 !ruby/object:Gem::Requirement
+  requirement: &2172703060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152083940
+  version_requirements: *2172703060
 description: Ruby interface to the joyent cloud API
 email: ben.wyrosdick@gmail.com
 executables:
@@ -170,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2383781494508247953
+      hash: -2890318799223133059
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: