engineyard-cloud-client 1.0.4 → 1.0.5

data/lib/engineyard-cloud-client.rb

@@ -5,11 +5,10 @@ end
 
 require 'engineyard-cloud-client/connection'
 require 'engineyard-cloud-client/model_registry'
-require 'engineyard-cloud-client/models'
-require 'engineyard-cloud-client/rest_client_ext'
-require 'engineyard-cloud-client/resolver_result'
-require 'engineyard-cloud-client/version'
-require 'engineyard-cloud-client/errors'
+require 'engineyard-cloud-client/models/app'
+require 'engineyard-cloud-client/models/app_environment'
+require 'engineyard-cloud-client/models/environment'
+require 'engineyard-cloud-client/models/user'
 require 'multi_json'
 require 'pp'
 require 'forwardable'

data/lib/engineyard-cloud-client/connection.rb

@@ -1,4 +1,6 @@
+require 'engineyard-cloud-client/version'
 require 'engineyard-cloud-client/rest_client_ext'
+require 'engineyard-cloud-client/errors'
 require 'multi_json'
 require 'uri'
 

data/lib/engineyard-cloud-client/models/app.rb

@@ -1,5 +1,7 @@
+require 'engineyard-cloud-client/models/api_struct'
+require 'engineyard-cloud-client/models/account'
+require 'engineyard-cloud-client/models/app_environment'
 require 'engineyard-cloud-client/errors'
-require 'engineyard-cloud-client/models'
 
 module EY
   class CloudClient

data/lib/engineyard-cloud-client/models/app_environment.rb

@@ -1,5 +1,8 @@
-require 'engineyard-cloud-client/models'
-require 'engineyard-cloud-client/errors'
+require 'engineyard-cloud-client/models/api_struct'
+require 'engineyard-cloud-client/models/app'
+require 'engineyard-cloud-client/models/environment'
+require 'engineyard-cloud-client/models/deployment'
+require 'engineyard-cloud-client/resolver_result'
 
 module EY
   class CloudClient

data/lib/engineyard-cloud-client/models/deployment.rb

@@ -1,5 +1,6 @@
-require 'engineyard-cloud-client/models'
+require 'engineyard-cloud-client/models/api_struct'
 require 'engineyard-cloud-client/errors'
+require 'stringio'
 
 module EY
   class CloudClient

data/lib/engineyard-cloud-client/models/environment.rb

@@ -1,5 +1,11 @@
-require 'engineyard-cloud-client/models'
+require 'engineyard-cloud-client/models/api_struct'
+require 'engineyard-cloud-client/models/account'
+require 'engineyard-cloud-client/models/app'
+require 'engineyard-cloud-client/models/app_environment'
+require 'engineyard-cloud-client/models/instance'
+require 'engineyard-cloud-client/models/log'
 require 'engineyard-cloud-client/models/recipes'
+require 'engineyard-cloud-client/resolver_result'
 require 'engineyard-cloud-client/errors'
 
 module EY

data/lib/engineyard-cloud-client/models/instance.rb

@@ -1,4 +1,4 @@
-require 'engineyard-cloud-client/errors'
+require 'engineyard-cloud-client/models/api_struct'
 
 module EY
   class CloudClient

data/lib/engineyard-cloud-client/models/keypair.rb

@@ -1,4 +1,5 @@
 require 'engineyard-cloud-client/models/api_struct'
+require 'engineyard-cloud-client/errors'
 
 module EY
   class CloudClient
@@ -27,6 +28,10 @@ module EY
         response = api.post("/keypairs", "keypair" => params)['keypair']
         self.from_hash(api, response)
       end
+
+      def destroy
+        api.delete("/keypairs/#{id}")
+      end
     end
   end
 end

data/lib/engineyard-cloud-client/models/log.rb

@@ -1,4 +1,4 @@
-require 'engineyard-cloud-client/models'
+require 'engineyard-cloud-client/models/api_struct'
 
 module EY
   class CloudClient

data/lib/engineyard-cloud-client/models/recipes.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'pathname'
 require 'engineyard-cloud-client/errors'
 
 module EY

data/lib/engineyard-cloud-client/models/user.rb

@@ -1,4 +1,6 @@
-require 'engineyard-cloud-client/models'
+require 'engineyard-cloud-client/models/api_struct'
+require 'engineyard-cloud-client/models/account'
+require 'engineyard-cloud-client/models/keypair'
 
 module EY
   class CloudClient
@@ -6,6 +8,10 @@ module EY
       def accounts
         EY::CloudClient::Account.all(api)
       end
+
+      def keypairs
+        EY::CloudClient::Keypair.all(api)
+      end
     end
   end
 end

data/lib/engineyard-cloud-client/test/fake_awsm/config.ru

@@ -87,6 +87,28 @@ class FakeAwsm < Sinatra::Base
     render :rabl, :user, :format => "json"
   end
 
+  post "/api/v2/keypairs" do
+    @keypair = @user.keypairs.create(params['keypair'])
+    render :rabl, :keypair, :format => "json"
+  end
+
+  get "/api/v2/keypairs" do
+    @keypairs = @user.keypairs
+    render :rabl, :keypairs, :format => "json"
+  end
+
+  delete "/api/v2/keypairs/:id" do
+    keypair = @user.keypairs.get(params['id'])
+    if keypair
+      keypair.destroy
+      status 204
+      ""
+    else
+      status 404
+      return {"message" => "Keypair not found with id #{params['id'].inspect}"}.to_json
+    end
+  end
+
   get "/api/v2/accounts" do
     @accounts = @user.accounts
     render :rabl, :accounts, :format => "json"

data/lib/engineyard-cloud-client/test/fake_awsm/models/keypair.rb

@@ -0,0 +1,13 @@
+require 'dm-core'
+
+class Keypair
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :name, String
+  property :public_key, String
+  property :fingerprint, String, :default => "12:34:56:78:9a:bc:de:f0:12:34:56:78:9a:bc:de:f0"
+
+  belongs_to :user
+
+end

data/lib/engineyard-cloud-client/test/fake_awsm/models/user.rb

@@ -11,5 +11,6 @@ class User
     :default => lambda { |r, p| File.open('/dev/urandom', 'r') { |fh| fh.read(16).unpack('H*').first }}
 
   has n, :accounts
+  has n, :keypairs
 
 end

data/lib/engineyard-cloud-client/test/fake_awsm/views/keypair.rabl

@@ -0,0 +1,2 @@
+object @keypair => :keypair
+attributes :id, :name, :public_key, :fingerprint

data/lib/engineyard-cloud-client/test/fake_awsm/views/keypairs.rabl

@@ -0,0 +1,2 @@
+collection @keypairs, :root => :keypairs, :object_root => false
+attributes :id, :name, :public_key, :fingerprint

data/lib/engineyard-cloud-client/version.rb

@@ -1,7 +1,7 @@
 # This file is maintained by a herd of rabid monkeys with Rakes.
 module EY
   class CloudClient
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end
 # Please be aware that the monkeys like tho throw poo sometimes.

data/spec/engineyard-cloud-client/integration/keypair_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe EY::CloudClient::Keypair do
+  before do
+    FakeWeb.allow_net_connect = true
+  end
+
+  it "creates, finds, and destroys keypairs" do
+    api = scenario_cloud_client "User Name"
+    keypair = EY::CloudClient::Keypair.create(api, {
+        "name"       => 'laptop',
+        "public_key" => "ssh-rsa OTHERKEYPAIR"
+    })
+
+    keypair.name.should == "laptop"
+    keypair.public_key.should == "ssh-rsa OTHERKEYPAIR"
+
+    keypairs = EY::CloudClient::Keypair.all(api)
+    keypairs.should =~ [keypair]
+
+    keypair.destroy
+  end
+end

data/spec/engineyard-cloud-client/integration/user_spec.rb

@@ -12,4 +12,14 @@ describe EY::CloudClient::User do
     user.accounts.size.should == 1
     user.accounts.first.name.should == 'main'
   end
+
+  it "has keypairs" do
+    api = scenario_cloud_client "User Name"
+    keypair = EY::CloudClient::Keypair.create(api, {
+        "name"       => 'laptop',
+        "public_key" => "ssh-rsa OTHERKEYPAIR"
+    })
+    api.current_user.keypairs.should include(keypair)
+    keypair.destroy
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-cloud-client
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -297,6 +297,7 @@ files:
 - lib/engineyard-cloud-client/test/fake_awsm/models/deployment.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models/environment.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models/instance.rb
+- lib/engineyard-cloud-client/test/fake_awsm/models/keypair.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models/user.rb
 - lib/engineyard-cloud-client/test/fake_awsm/models.rb
 - lib/engineyard-cloud-client/test/fake_awsm/scenarios.rb
@@ -308,6 +309,8 @@ files:
 - lib/engineyard-cloud-client/test/fake_awsm/views/deployment.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/environments.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/instances.rabl
+- lib/engineyard-cloud-client/test/fake_awsm/views/keypair.rabl
+- lib/engineyard-cloud-client/test/fake_awsm/views/keypairs.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/resolve_app_environments.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/resolve_environments.rabl
 - lib/engineyard-cloud-client/test/fake_awsm/views/user.rabl
@@ -324,12 +327,12 @@ files:
 - spec/engineyard-cloud-client/integration/app_spec.rb
 - spec/engineyard-cloud-client/integration/deployment_spec.rb
 - spec/engineyard-cloud-client/integration/environment_spec.rb
+- spec/engineyard-cloud-client/integration/keypair_spec.rb
 - spec/engineyard-cloud-client/integration/user_spec.rb
 - spec/engineyard-cloud-client/models/api_struct_spec.rb
 - spec/engineyard-cloud-client/models/app_spec.rb
 - spec/engineyard-cloud-client/models/environment_spec.rb
 - spec/engineyard-cloud-client/models/instance_spec.rb
-- spec/engineyard-cloud-client/models/keypair_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_recipes.tgz
 - spec/support/helpers.rb
@@ -348,7 +351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2753056383473924638
+      hash: 4182640677439881868
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -357,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2753056383473924638
+      hash: 4182640677439881868
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -371,12 +374,12 @@ test_files:
 - spec/engineyard-cloud-client/integration/app_spec.rb
 - spec/engineyard-cloud-client/integration/deployment_spec.rb
 - spec/engineyard-cloud-client/integration/environment_spec.rb
+- spec/engineyard-cloud-client/integration/keypair_spec.rb
 - spec/engineyard-cloud-client/integration/user_spec.rb
 - spec/engineyard-cloud-client/models/api_struct_spec.rb
 - spec/engineyard-cloud-client/models/app_spec.rb
 - spec/engineyard-cloud-client/models/environment_spec.rb
 - spec/engineyard-cloud-client/models/instance_spec.rb
-- spec/engineyard-cloud-client/models/keypair_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_recipes.tgz
 - spec/support/helpers.rb

data/spec/engineyard-cloud-client/models/keypair_spec.rb

@@ -1,58 +0,0 @@
-require 'spec_helper'
-
-describe EY::CloudClient::Keypair do
-  describe ".all" do
-    it "hits the index action in the API" do
-      response = {
-        "keypairs" => [
-          {
-            "fingerprint" => "11:f4:11:11:47:db:b7:3f:06:a9:XX:XX:XX:XX:XX:XX",
-            "id" => 123,
-            "name" => "macbook pro",
-            "public_key" => "ssh-dss MYKEYPAIR"
-          }
-        ]
-      }
-
-      FakeWeb.register_uri(:get, "https://cloud.engineyard.com/api/v2/keypairs",
-        :body => response.to_json, :content_type => "application/json")
-
-      keypairs = EY::CloudClient::Keypair.all(cloud_client)
-
-      keypairs.length.should == 1
-      keypairs.first.name.should == "macbook pro"
-    end
-  end
-
-  describe ".create" do
-    it "hits the create action in the API" do
-      response = {
-        "keypair" => {
-          "fingerprint" => "ce:90:99:b8:62:74:66:2f:ec:bc:XX:XX:XX:XX:XX:XX",
-          "id" => 234,
-          "name" => "laptop",
-          "public_key" => "ssh-rsa OTHERKEYPAIR"
-        }
-      }
-
-      FakeWeb.register_uri(:post, "https://cloud.engineyard.com/api/v2/keypairs",
-        :body => response.to_json, :content_type => "application/json")
-
-      keypair = EY::CloudClient::Keypair.create(cloud_client, {
-        "name"       => 'laptop',
-        "public_key" => "ssh-rsa OTHERKEYPAIR"
-      })
-
-      FakeWeb.should have_requested(:post, "https://cloud.engineyard.com/api/v2/keypairs")
-
-      keypair.name.should == "laptop"
-      keypair.public_key.should == "ssh-rsa OTHERKEYPAIR"
-    end
-  end
-
-  describe "#destroy" do
-    it "hits the destroy action in the API" do
-      pending
-    end
-  end
-end