joyent 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/joyent

@@ -3,8 +3,8 @@
 require 'rubygems'
 require 'thor'
 require 'yaml'
-require File.join(File.dirname(__FILE__), '../lib/joyent')
 require 'highline/import'
+require File.join(File.dirname(__FILE__), '../lib/joyent')
 
 class JoyentCLI < Thor
   private
@@ -28,8 +28,8 @@ class JoyentCLI < Thor
   end
 
   def get_config
-    @username = ask("Username (login): ")
-    @password = ask("Password: "){|q| q.echo = false}
+    @username = ask("Username (login): "){|q| q.echo = true}
+    @password = ask("Password: "){|q| q.echo = '*'}
 
     config_file = File.join(ENV['HOME'], ".joyentcli")
     config = {"username" => @username, "password" => @password}
@@ -38,8 +38,52 @@ class JoyentCLI < Thor
     }
   end
 
+  def get_rsa_key(key)
+    if key =~ /^ssh-rsa\s/
+      key
+    else
+      File.open(key, 'r').read
+    end
+  end
+
   public
 
+  # 
+  # Keys
+  #
+  desc "list_keys", "list all of the available keys"
+  def list_keys
+    conn = get_connection
+    conn.keys.list.each do |dc|
+      puts dc.name
+    end
+  end
+
+  desc "get_key NAME", "get the text of the specified key"
+  def get_key(name)
+    conn = get_connection
+    key = conn.keys.get(name)
+    puts key.key
+  end
+
+  desc "create_key", "create a new public key with NAME and KEY"
+  method_option :name, :type => :string, :aliases => "-n", :required => true
+  method_option :key, :type => :string, :aliases => "-k", :required => true
+  def create_key
+    conn = get_connection
+    key = conn.keys.create(options["name"], get_rsa_key(options["key"]))
+    puts key.name
+    puts key.key
+  end
+
+  desc "delete_key NAME", "get the text of the specified key"
+  def delete_key(name)
+    conn = get_connection
+    key = conn.keys.get(name)
+    key.delete
+    puts "DELETED: #{key.name}"
+  end
+
   # 
   # Datacenters
   #

data/joyent.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{joyent}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Wyrosdick"]
-  s.date = %q{2011-09-15}
+  s.date = %q{2011-09-29}
   s.default_executable = %q{joyent}
   s.description = %q{Ruby interface to the joyent cloud API}
   s.email = %q{ben.wyrosdick@gmail.com}
@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
     "lib/joyent/datacenters.rb",
     "lib/joyent/dataset.rb",
     "lib/joyent/datasets.rb",
+    "lib/joyent/key.rb",
+    "lib/joyent/keys.rb",
     "lib/joyent/machine.rb",
     "lib/joyent/machines.rb",
     "lib/joyent/package.rb",
@@ -44,11 +46,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mongohq/joyent}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Ruby interface to the joyent cloud API}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/joyent/connection.rb

@@ -43,6 +43,10 @@ module Joyent
       end
     end
 
+    def keys
+      @keys ||= Joyent::Keys.new(self)
+    end
+
     def datacenters
       @datacenters ||= Joyent::Datacenters.new(self)
     end

data/lib/joyent/key.rb

@@ -0,0 +1,16 @@
+module Joyent
+  class Key
+    attr_reader :name, :key
+
+    def initialize(connection, attributes)
+      @connection = connection
+
+      @name = attributes["name"]
+      @key = attributes["key"]
+    end
+
+    def delete
+      @connection.execute(:delete, "/keys/#{name}")
+    end
+  end
+end

data/lib/joyent/keys.rb

@@ -0,0 +1,19 @@
+module Joyent
+  class Keys
+    def initialize(connection)
+      @connection = connection
+    end
+
+    def list
+      @connection.execute(:get, "/keys").map{|attributes| Joyent::Key.new(@connection, attributes)}
+    end
+
+    def get(name)
+      Joyent::Key.new(@connection, @connection.execute(:get, "/keys/#{name}"))
+    end
+
+    def create(name, key)
+      Joyent::Key.new(@connection, @connection.execute(:post, "/keys", {:name => name, :key => key}))
+    end
+  end
+end

data/lib/joyent/machines.rb

@@ -5,7 +5,7 @@ module Joyent
     end
 
     def list
-      @connection.execute(:get, "/machines").map{|attributes| Joyent::Machine.new(self, attributes)}
+      @connection.execute(:get, "/machines").map{|attributes| Joyent::Machine.new(@connection, attributes)}
     end
 
     def get(id)

metadata

@@ -1,179 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: joyent
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ben Wyrosdick
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-15 00:00:00 -07:00
+date: 2011-09-29 00:00:00.000000000 -07:00
 default_executable: joyent
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152071900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: *2152071900
+- !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2152071420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *2152071420
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2152070940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: *2152070940
+- !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2152070460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *2152070460
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2152069980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *2152069980
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2152085860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *2152085860
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2152085380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *2152085380
+- !ruby/object:Gem::Dependency
   name: highline
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2152084900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: *2152084900
+- !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2152084420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: *2152084420
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2152083940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152083940
 description: Ruby interface to the joyent cloud API
 email: ben.wyrosdick@gmail.com
-executables: 
+executables:
 - joyent
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -189,6 +146,8 @@ files:
 - lib/joyent/datacenters.rb
 - lib/joyent/dataset.rb
 - lib/joyent/datasets.rb
+- lib/joyent/key.rb
+- lib/joyent/keys.rb
 - lib/joyent/machine.rb
 - lib/joyent/machines.rb
 - lib/joyent/package.rb
@@ -197,37 +156,31 @@ files:
 - test/test_joyent.rb
 has_rdoc: true
 homepage: http://github.com/mongohq/joyent
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2383781494508247953
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the joyent cloud API
 test_files: []
-