smartdc 1.2.2 → 1.3.0

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 .rspec
 .sdccfg
 .sdccfg.*
+
+sftp-config.json

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
 gemfile:
-  - Gemfile
+  - Gemfile

data/Gemfile

@@ -4,11 +4,14 @@ gem "rake"
 
 group :development do
   gem "bundler"
-  gem "rspec"
+end
+
+group :test do
+  gem "rspec", ">= 2.11"
 end
 
 group :runtime do
   gem "faraday", "~> 0.8"
-  gem "thor", "~> 0.16"
+  gem "thor", "~> 0.18"
   gem "terminal-table", "~> 1.4"
 end

data/README.md

@@ -1,6 +1,8 @@
 smartdc
 =======
 
+[![Gem Version](https://badge.fury.io/rb/smartdc.png)](https://rubygems.org/gems/smartdc) [![Build Status](https://travis-ci.org/ogom/ruby-smartdc.png?branch=master)](https://travis-ci.org/ogom/ruby-smartdc)
+
 ```
               .
               |
@@ -10,7 +12,7 @@ smartdc
 
 ```
 
-smartdc is Joyent's [SmartDataCenter](http://www.joyent.com/software/smartdatacenter) client and SmartDataCenter Command Line Interface.  
+smartdc is Joyent's [SmartDataCenter](http://www.joyent.com/software/smartdatacenter) client and SDC Command Line Interface.  
 [Joyent CloudAPI Documentation](http://apidocs.joyent.com/sdcapidoc/cloudapi/).  
 
 
@@ -89,9 +91,6 @@ end
 $ rake spec
 ```
 
-[![Build Status](https://travis-ci.org/ogom/ruby-smartdc.png?branch=master)](https://travis-ci.org/ogom/ruby-smartdc)
-
-
 ## License 
 
 * MIT

data/lib/smartdc/api/analytics.rb

@@ -41,4 +41,4 @@ module Smartdc
       end
     end
   end
-end
+end

data/lib/smartdc/api/analytics/heatmap.rb

@@ -17,4 +17,4 @@ module Smartdc::Api
       end  
     end
   end
-end
+end

data/lib/smartdc/api/datacenters.rb

@@ -17,4 +17,4 @@ module Smartdc
       end
     end
   end
-end
+end

data/lib/smartdc/api/datasets.rb

@@ -17,4 +17,4 @@ module Smartdc
       end
     end
   end
-end
+end

data/lib/smartdc/api/keys.rb

@@ -26,4 +26,4 @@ module Smartdc
       end
     end
   end
-end
+end

data/lib/smartdc/api/machine/metadata.rb

@@ -21,4 +21,4 @@ module Smartdc::Api
       end
     end
   end
-end
+end

data/lib/smartdc/api/machine/snapshots.rb

@@ -32,4 +32,4 @@ module Smartdc::Api
       end
     end
   end
-end
+end

data/lib/smartdc/api/machine/tags.rb

@@ -26,4 +26,4 @@ module Smartdc::Api
       end
     end
   end
-end
+end

data/lib/smartdc/api/machines.rb

@@ -67,4 +67,4 @@ module Smartdc
       end
     end
   end
-end
+end

data/lib/smartdc/api/packages.rb

@@ -18,3 +18,4 @@ module Smartdc
     end
   end
 end
+

data/lib/smartdc/client.rb

@@ -37,4 +37,4 @@ module Smartdc
       Smartdc::Api::Analytics.new(options)
     end
   end
-end
+end

data/lib/smartdc/error.rb

@@ -32,4 +32,4 @@ module Smartdc
   class Error::NotImplemented < Smartdc::Error; end
   class Error::BadGateway < Smartdc::Error; end
   class Error::ServiceUnavailable < Smartdc::Error; end
-end
+end

data/lib/smartdc/response/raise_error.rb

@@ -35,4 +35,4 @@ module Smartdc
       end
     end
   end
-end
+end

data/lib/smartdc/version.rb

@@ -1,3 +1,3 @@
 module Smartdc
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/smartdc.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency(%q<faraday>, ["~> 0.8"])
-  gem.add_runtime_dependency(%q<thor>, ["~> 0.16"])
+  gem.add_runtime_dependency(%q<thor>, ["~> 0.18"])
   gem.add_runtime_dependency(%q<terminal-table>, ["~> 1.4"])
 end

data/spec/fixtures/datacenter.json

@@ -1,4 +1,4 @@
 {
   "code": "ResourceMoved",
   "message": "Osaka is at https://127.0.0.1"
-}
+}

data/spec/fixtures/datacenters.json

@@ -1,3 +1,3 @@
 {
   "Osaka": "https://127.0.0.1"
-}
+}

data/spec/fixtures/machines.json

@@ -33,4 +33,4 @@
     "updated": "2012-12-12T23:59:04+00:00",
     "primaryIp": "192.168.1.3"
   }
-]
+]

data/spec/fixtures/packages.json

@@ -15,4 +15,4 @@
     "swap": 1024,
     "default": false
   }
-]
+]

data/spec/fixtures/snapshots.json

@@ -5,4 +5,4 @@
     "created": "2012-12-12T23:59:01+00:00",
     "updated": "2012-12-12T23:59:02+00:00"
   }
-]
+]

data/spec/fixtures/tag.json

@@ -1,3 +1,3 @@
 {
   "k001": "v001"
-}
+}

data/spec/unit/smartdc/api/analytics_spec.rb

@@ -1,52 +1,47 @@
 require 'spec_helper'
 
-describe "Smartdc::Api::Analytics" do
-  
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+describe Smartdc::Api::Analytics do
+
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:analytics) {Smartdc::Api::Analytics.new({})}
 
   describe ".create" do
-    it "should return a instrumentation" do
-      @object.stub(:content) {fixture('analytics')[0]}
-      analytic = @object.content
-      @request.stub_chain(:new, :post).with('my/analytics/instrumentations/', analytic) {@object}
+    it "creates a instrumentation" do
+      object.stub(:content) {fixture('analytics')[0]}
+      analytic = object.content
+      request.stub_chain(:new, :post).with('my/analytics/instrumentations/', analytic) {object}
 
-      analytics = Smartdc::Api::Analytics.new({})
-      analytics.create(analytic).content['id'].should == analytic['id']
+      expect(analytics.create(analytic).content['id']).to eq(analytic['id'])
     end
   end
 
   describe ".read" do
-    it "should return a instrumentation" do
-      @object.stub(:content) {fixture('analytics')[0]}
-      id = @object.content['id']
-      @request.stub_chain(:new, :get).with('my/analytics/instrumentations/' + id) {@object}
+    it "returns a instrumentation" do
+      object.stub(:content) {fixture('analytics')[0]}
+      id = object.content['id']
+      request.stub_chain(:new, :get).with('my/analytics/instrumentations/' + id) {object}
 
-      analytics = Smartdc::Api::Analytics.new({})
-      analytics.read(id).content['id'].should == id
+      expect(analytics.read(id).content['id']).to eq(id)
     end
   end
 
   describe ".all" do
-    it "should return some instrumentations" do
-      @object.stub(:content) {fixture('analytics')}
-      @request.stub_chain(:new, :get).with('my/analytics/instrumentations', {}) {@object}
+    it "returns some instrumentations" do
+      object.stub(:content) {fixture('analytics')}
+      request.stub_chain(:new, :get).with('my/analytics/instrumentations', {}) {object}
 
-      analytics = Smartdc::Api::Analytics.new({})
-      analytics.all.content.count.should > 0
+      expect(analytics.all.content.count).to be > 0
     end
   end
 
-  describe ".delete" do
-    it "should return true when success" do
+  describe ".destroy" do
+    it "returns true when success" do
       analytic = fixture('analytics')[0]
-      @object.stub(:status) {204}
-      @request.stub_chain(:new, :del).with('my/analytics/instrumentations/' + analytic['id']) {@object}
+      object.stub(:status) {204}
+      request.stub_chain(:new, :del).with('my/analytics/instrumentations/' + analytic['id']) {object}
 
-      analytics = Smartdc::Api::Analytics.new({})
-      analytics.destroy(analytic['id']).status.should == 204
+      expect(analytics.destroy(analytic['id']).status).to eq(204)
     end
   end
 

data/spec/unit/smartdc/api/datacenters_spec.rb

@@ -1,30 +1,27 @@
 require 'spec_helper'
 
-describe "Smartdc::Api::Datacenters" do
+describe Smartdc::Api::Datacenters do
 
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:datacenters) {Smartdc::Api::Datacenters.new({})}
 
   describe ".read" do
-    it "should return a datacenter" do
-      @object.stub(:content) {fixture('datacenter')}
+    it "returns a datacenter" do
+      object.stub(:content) {fixture('datacenter')}
       name = fixture('datacenters').first[0]
-      @request.stub_chain(:new, :get).with('my/datacenters/' + name) {@object}
+      request.stub_chain(:new, :get).with('my/datacenters/' + name) {object}
 
-      datacenters = Smartdc::Api::Datacenters.new({})
-      datacenters.read(name).content['message'].should match(/#{name}/)
+      expect(datacenters.read(name).content['message']).to match(/#{name}/)
     end
   end
 
   describe ".all" do
-    it "should return some datacenter" do
-      @object.stub(:content) {fixture('datacenters')}
-      @request.stub_chain(:new, :get).with('my/datacenters', {}) {@object}
+    it "returns some datacenter" do
+      object.stub(:content) {fixture('datacenters')}
+      request.stub_chain(:new, :get).with('my/datacenters', {}) {object}
 
-      datacenters = Smartdc::Api::Datacenters.new({})
-      datacenters.all.content.count.should > 0
+      expect(datacenters.all.content.count).to be > 0
     end
   end
 

data/spec/unit/smartdc/api/datasets_spec.rb

@@ -1,31 +1,28 @@
 require 'spec_helper'
 
-describe "Smartdc::Api::Datasets" do
+describe Smartdc::Api::Datasets do
 
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:datasets) {Smartdc::Api::Datasets.new({})}
 
   describe ".read" do
-    it "should return a dataset" do
-      @object.stub(:content) {fixture('datasets')[0]}
-      id = @object.content['id']
-      @request.stub_chain(:new, :get).with('my/datasets/' + id) {@object}
+    it "returns a dataset" do
+      object.stub(:content) {fixture('datasets')[0]}
+      id = object.content['id']
+      request.stub_chain(:new, :get).with('my/datasets/' + id) {object}
 
-      datasets = Smartdc::Api::Datasets.new({})
-      datasets.read(id).content['id'].should == id
+      expect(datasets.read(id).content['id']).to eq(id)
     end
   end
 
   describe ".all" do
-    it "should return some datasets" do
-      @object.stub(:content) {fixture('datasets')}
-      @request.stub_chain(:new, :get).with('my/datasets', {}) {@object}
+    it "returns some datasets" do
+      object.stub(:content) {fixture('datasets')}
+      request.stub_chain(:new, :get).with('my/datasets', {}) {object}
 
-      datasets = Smartdc::Api::Datasets.new({})
-      datasets.all.content.count.should > 0
+      expect(datasets.all.content.count).to be > 0
     end
   end
 
-end
+end

data/spec/unit/smartdc/api/keys_spec.rb

@@ -1,53 +1,48 @@
 require 'spec_helper'
 
-describe "Smartdc::Api::Keys" do
+describe Smartdc::Api::Keys do
 
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:keys) {Smartdc::Api::Keys.new({})}
 
   describe ".create" do
-    it "should return a key" do
-      @object.stub(:content) {fixture('keys')[0]}
-      key = @object.content
-      @request.stub_chain(:new, :post).with('my/keys/', key) {@object}
+    it "creates a key" do
+      object.stub(:content) {fixture('keys')[0]}
+      key = object.content
+      request.stub_chain(:new, :post).with('my/keys/', key) {object}
 
-      keys = Smartdc::Api::Keys.new({})
-      keys.create(key).content['name'].should == key['name']
+      expect(keys.create(key).content['name']).to eq(key['name'])
     end
   end
 
   describe ".read" do
-    it "should return a key" do
-      @object.stub(:content) {fixture('keys')[0]}
-      name = @object.content['name']
-      @request.stub_chain(:new, :get).with('my/keys/' + name) {@object}
+    it "returns a key" do
+      object.stub(:content) {fixture('keys')[0]}
+      name = object.content['name']
+      request.stub_chain(:new, :get).with('my/keys/' + name) {object}
 
-      keys = Smartdc::Api::Keys.new({})
-      keys.read(name).content['name'].should == name
+      expect(keys.read(name).content['name']).to eq(name)
     end
   end
 
   describe ".all" do
-    it "should return some keys" do
-      @object.stub(:content) {fixture('keys')}
-      @request.stub_chain(:new, :get).with('my/keys', {}) {@object}
+    it "returns some keys" do
+      object.stub(:content) {fixture('keys')}
+      request.stub_chain(:new, :get).with('my/keys', {}) {object}
 
-      keys = Smartdc::Api::Keys.new({})
-      keys.all.content.count.should > 0
+      expect(keys.all.content.count).to be > 1
     end
   end
 
-  describe ".delete" do
-    it "should return true when success" do
+  describe ".destroy" do
+    it "returns true when success" do
       key = fixture('keys')[0]
-      @object.stub(:status) {204}
-      @request.stub_chain(:new, :del).with('my/keys/' + key['name']) {@object}
+      object.stub(:status) {204}
+      request.stub_chain(:new, :del).with('my/keys/' + key['name']) {object}
 
-      keys = Smartdc::Api::Keys.new({})
-      keys.destroy(key['name']).status.should == 204
+      expect(keys.destroy(key['name']).status).to eq(204)
     end
   end
 
-end
+end

data/spec/unit/smartdc/api/machine/metadata_spec.rb

@@ -1,41 +1,37 @@
 require 'spec_helper'
 
-describe "Smartdc::Api::Machine::Metadata" do
-  
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+describe Smartdc::Api::Machine::Metadata do
+
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:metadata) {Smartdc::Api::Machine::Metadata.new('id', {})}
 
   describe ".create" do
-    it "should return a metadata" do
-      @object.stub(:content) {fixture('tag')}
-      tag = @object.content
-      @request.stub_chain(:new, :post).with('my/machines/id/metadata/', tag) {@object}
+    it "creates a metadata" do
+      object.stub(:content) {fixture('tag')}
+      tag = object.content
+      request.stub_chain(:new, :post).with('my/machines/id/metadata/', tag) {object}
 
-      metadata = Smartdc::Api::Machine::Metadata.new('id', {})
-      metadata.create(tag).content.should == tag
+      expect(metadata.create(tag).content).to eq(tag)
     end
   end
 
   describe ".read" do
-    it "should return some metadata" do
-      @object.stub(:content) {fixture('tag')}
-      @request.stub_chain(:new, :get).with('my/machines/id/metadata', {}) {@object}
+    it "return some metadata" do
+      object.stub(:content) {fixture('tag')}
+      request.stub_chain(:new, :get).with('my/machines/id/metadata', {}) {object}
 
-      metadata = Smartdc::Api::Machine::Metadata.new('id', {})
-      metadata.read.content.count.should > 0
+      expect(metadata.read.content.count).to be > 0
     end
   end
 
-  describe ".delete" do
-    it "should return a metadata" do
-      @object.stub(:status) {204}
+  describe ".destroy" do
+    it "return a metadata" do
+      object.stub(:status) {204}
       key = fixture('tag').first[0]
-      @request.stub_chain(:new, :del).with('my/machines/id/metadata/' + key) {@object}
+      request.stub_chain(:new, :del).with('my/machines/id/metadata/' + key) {object}
 
-      metadata = Smartdc::Api::Machine::Metadata.new('id', {})
-      metadata.destroy(key).status.should == 204
+      expect(metadata.destroy(key).status).to eq(204)
     end
   end
 

data/spec/unit/smartdc/api/machine/snapshots_spec.rb

@@ -1,132 +1,48 @@
-
 require 'spec_helper'
 
-describe "Smartdc::Api::Machine::Snapshots" do
+describe Smartdc::Api::Machine::Snapshots do
   
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:snapshots) {Smartdc::Api::Machine::Snapshots.new('id', {})}
 
   describe ".create" do
-    it "should return a snapshot" do
-      @object.stub(:content) {fixture('snapshots')[0]}
-      snapshot = @object.content
-      @request.stub_chain(:new, :post).with('my/machines/id/snapshots/', snapshot) {@object}
+    it "creates a snapshot" do
+      object.stub(:content) {fixture('snapshots')[0]}
+      snapshot = object.content
+      request.stub_chain(:new, :post).with('my/machines/id/snapshots/', snapshot) {object}
 
-      snapshots = Smartdc::Api::Machine::Snapshots.new('id', {})
-      snapshots.create(snapshot).content['name'].should == snapshot['name']
+      expect(snapshots.create(snapshot).content['name']).to eq(snapshot['name'])
     end
   end
 
   describe ".read" do
-    it "should return a snapshot" do
-      @object.stub(:content) {fixture('snapshots')[0]}
-      name = @object.content['name']
-      @request.stub_chain(:new, :get).with('my/machines/id/snapshots/' + name) {@object}
+    it "return a snapshot" do
+      object.stub(:content) {fixture('snapshots')[0]}
+      name = object.content['name']
+      request.stub_chain(:new, :get).with('my/machines/id/snapshots/' + name) {object}
 
-      snapshots = Smartdc::Api::Machine::Snapshots.new('id', {})
-      snapshots.read(name).content['name'].should == name
+      expect(snapshots.read(name).content['name']).to eq(name)
     end
   end
 
   describe ".all" do
-    it "should return some snapshots" do
-      @object.stub(:content) {fixture('snapshots')}
-      @request.stub_chain(:new, :get).with('my/machines/id/snapshots', {}) {@object}
+    it "return some snapshots" do
+      object.stub(:content) {fixture('snapshots')}
+      request.stub_chain(:new, :get).with('my/machines/id/snapshots', {}) {object}
 
-      snapshots = Smartdc::Api::Machine::Snapshots.new('id', {})
-      snapshots.all.content.count.should > 0
+      expect(snapshots.all.content.count).to be > 0
     end
   end
 
-  describe ".delete" do
-    it "should return a snapshot" do
-      @object.stub(:status) {204}
+  describe ".destroy" do
+    it "return a snapshot" do
+      object.stub(:status) {204}
       name = fixture('snapshots')[0]['name']
-      @request.stub_chain(:new, :del).with('my/machines/id/snapshots/' + name) {@object}
+      request.stub_chain(:new, :del).with('my/machines/id/snapshots/' + name) {object}
 
-      snapshots = Smartdc::Api::Machine::Snapshots.new('id', {})
-      snapshots.destroy(name).status.should == 204
+      expect(snapshots.destroy(name).status).to eq(204)
     end
   end
 
 end
-
-
-
-
-
-
-
-
-# require 'spec_helper'
-
-# describe "Smartdc::Api::Machine::Snapshots" do
-#   before(:all) do
-#     @fixture = fixture('tag')
-#     @name = UUID.new.generate
-#     client.datasets.find.each do |dataset|
-#       if dataset.type == "smartmachine"
-#         @dataset_urn = dataset.urn
-#         break
-#       end
-#     end
-
-#     machine = {
-#       'name'    => @name,
-#       'dataset' => @dataset_urn
-#     }
-#     @machine = client.machines.create machine
-#     machine = client.machines(@machine.id)
-#     88.times do |i|
-#       break if machine.read.state == 'running'
-#       sleep i
-#     end
-#     88.times do |i|
-#       break if machine.read.state == 'running'
-#       sleep i
-#     end
-#     machine.stop
-#     88.times do |i|
-#       break if machine.read.state == 'stopped'
-#       sleep i
-#     end
-#   end
-
-#   describe ".create" do
-#     it "should return a snapshot" do
-#       snapshot = client.machines(@machine.id).snapshots.create @fixture
-#       snapshot.name.should eq @fixture['name']
-#     end
-#   end
-
-#   describe ".read" do
-#     it "should return a snapshot" do
-#       client.machines(@machine.id).snapshots('sample').read.name.should eq @fixture['name']
-#     end
-#   end
-
-#   describe ".find" do
-#     it "should return some snapshots" do
-#       client.machines(@machine.id).snapshots.find.count.should > 0
-#     end
-#   end
-
-#   describe ".delete" do
-#     it "should return true when success" do
-#       client.machines(@machine.id).snapshots('sample').delete.should be_nil
-#     end
-#   end
-
-#   after(:all) do
-#     sleep 8
-#     machine = client.machines(@machine.id)
-#     machine.stop
-#     88.times do |i|
-#       break if machine.read.state == 'stopped'
-#       sleep i
-#     end
-#     client.machines(@machine.id).delete
-#   end
-# end

data/spec/unit/smartdc/api/machine/tags_spec.rb

@@ -1,52 +1,47 @@
 require 'spec_helper'
 
-describe "Smartdc::Api::Machine::Tags" do
+describe Smartdc::Api::Machine::Tags do
   
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:tags) {Smartdc::Api::Machine::Tags.new('id', {})}
 
   describe ".create" do
-    it "should return a tag" do
-      @object.stub(:content) {fixture('tag')}
-      tag = @object.content
-      @request.stub_chain(:new, :post).with('my/machines/id/tags/', tag) {@object}
+    it "creates a tag" do
+      object.stub(:content) {fixture('tag')}
+      tag = object.content
+      request.stub_chain(:new, :post).with('my/machines/id/tags/', tag) {object}
 
-      tags = Smartdc::Api::Machine::Tags.new('id', {})
-      tags.create(tag).content.should == tag
+      expect(tags.create(tag).content).to eq(tag)
     end
   end
 
   describe ".read" do
-    it "should return a tag" do
-      @object.stub(:content) {fixture('tag')}
-      key = @object.content.first[0]
-      @request.stub_chain(:new, :get).with('my/machines/id/tags/' + key) {@object}
+    it "return a tag" do
+      object.stub(:content) {fixture('tag')}
+      key = object.content.first[0]
+      request.stub_chain(:new, :get).with('my/machines/id/tags/' + key) {object}
 
-      tags = Smartdc::Api::Machine::Tags.new('id', {})
-      tags.read(key).content.first[0].should == key
+      expect(tags.read(key).content.first[0]).to eq(key)
     end
   end
 
   describe ".all" do
-    it "should return some tags" do
-      @object.stub(:content) {fixture('tag')}
-      @request.stub_chain(:new, :get).with('my/machines/id/tags', {}) {@object}
+    it "return some tags" do
+      object.stub(:content) {fixture('tag')}
+      request.stub_chain(:new, :get).with('my/machines/id/tags', {}) {object}
 
-      tags = Smartdc::Api::Machine::Tags.new('id', {})
-      tags.all.content.count.should > 0
+      expect(tags.all.content.count).to be > 0
     end
   end
 
-  describe ".delete" do
-    it "should return a tag" do
-      @object.stub(:status) {204}
+  describe ".destroy" do
+    it "return a tag" do
+      object.stub(:status) {204}
       key = fixture('tag').first[0]
-      @request.stub_chain(:new, :del).with('my/machines/id/tags/' + key) {@object}
+      request.stub_chain(:new, :del).with('my/machines/id/tags/' + key) {object}
 
-      tags = Smartdc::Api::Machine::Tags.new('id', {})
-      tags.destroy(key).status.should == 204
+      expect(tags.destroy(key).status).to eq(204)
     end
   end
 

data/spec/unit/smartdc/api/machines_spec.rb

@@ -1,53 +1,48 @@
 require 'spec_helper'
 
-describe "Smartdc::Api::Machines" do
+describe Smartdc::Api::Machines do
   
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:machines) {Smartdc::Api::Machines.new({})}
 
   describe ".create" do
-    it "should return a machine" do
-      @object.stub(:content) {fixture('machines')[0]}
-      machine = @object.content
-      @request.stub_chain(:new, :post).with('my/machines/', machine) {@object}
+    it "creates a machine" do
+      object.stub(:content) {fixture('machines')[0]}
+      machine = object.content
+      request.stub_chain(:new, :post).with('my/machines/', machine) {object}
 
-      machines = Smartdc::Api::Machines.new({})
-      machines.create(machine).content['name'].should == machine['name']
+      expect(machines.create(machine).content['name']).to eq(machine['name'])
     end
   end
 
   describe ".read" do
-    it "should return a machine" do
-      @object.stub(:content) {fixture('machines')[0]}
-      name = @object.content['name']
-      @request.stub_chain(:new, :get).with('my/machines/' + name) {@object}
+    it "returns a machine" do
+      object.stub(:content) {fixture('machines')[0]}
+      name = object.content['name']
+      request.stub_chain(:new, :get).with('my/machines/' + name) {object}
 
-      machines = Smartdc::Api::Machines.new({})
-      machines.read(name).content['name'].should == name
+      expect(machines.read(name).content['name']).to eq(name)
     end
   end
 
   describe ".all" do
-    it "should return some machines" do
-      @object.stub(:content) {fixture('machines')}
-      @request.stub_chain(:new, :get).with('my/machines', {}) {@object}
+    it "returns some machines" do
+      object.stub(:content) {fixture('machines')}
+      request.stub_chain(:new, :get).with('my/machines', {}) {object}
 
-      machines = Smartdc::Api::Machines.new({})
-      machines.all.content.count.should > 0
+      expect(machines.all.content.count).to be > 1
     end
   end
 
-  describe ".delete" do
-    it "should return true when success" do
+  describe ".destroy" do
+    it "returns true when success" do
       machine = fixture('machines')[0]
-      @object.stub(:status) {204}
-      @request.stub_chain(:new, :del).with('my/machines/' + machine['name']) {@object}
+      object.stub(:status) {204}
+      request.stub_chain(:new, :del).with('my/machines/' + machine['name']) {object}
 
-      machines = Smartdc::Api::Machines.new({})
-      machines.destroy(machine['name']).status.should == 204
+      expect(machines.destroy(machine['name']).status).to eq(204)
     end
   end
 
-end
+end

data/spec/unit/smartdc/api/packages_spec.rb

@@ -1,30 +1,27 @@
 require 'spec_helper'
 
-describe "Smartdc::Api::Packages" do
+describe Smartdc::Api::Packages do
 
-  before(:all) do
-    @object = Object.new
-    @request = Smartdc::Request
-  end
+  let(:object) {Object.new}
+  let(:request) {Smartdc::Request}
+  let(:packages) {Smartdc::Api::Packages.new({})}
 
   describe ".read" do
-    it "should return a package" do
-      @object.stub(:content) {fixture('packages')[0]}
-      name = @object.content['name']
-      @request.stub_chain(:new, :get).with('my/packages/' + name) {@object}
+    it "returns a package" do
+      object.stub(:content) {fixture('packages')[0]}
+      name = object.content['name']
+      request.stub_chain(:new, :get).with('my/packages/' + name) {object}
 
-      packages = Smartdc::Api::Packages.new({})
-      packages.read(name).content['name'].should == name
+      expect(packages.read(name).content['name']).to eq(name)
     end
   end
 
   describe ".all" do
-    it "should return some packages" do
-      @object.stub(:content) {fixture('packages')}
-      @request.stub_chain(:new, :get).with('my/packages', {}) {@object}
+    it "returns some packages" do
+      object.stub(:content) {fixture('packages')}
+      request.stub_chain(:new, :get).with('my/packages', {}) {object}
 
-      packages = Smartdc::Api::Packages.new({})
-      packages.all.content.count.should > 0
+      expect(packages.all.content.count).to be > 1
     end
   end
 

data/spec/unit/smartdc/client_spec.rb

@@ -1,39 +1,40 @@
 require 'spec_helper'
 
-describe "Smartdc::Client" do
+describe Smartdc::Client do
   describe ".keys" do
-    it "should return a Smartdc::Api::Keys" do
-      Smartdc::Client.new.keys.should be_a Smartdc::Api::Keys
+    it "is a Smartdc::Api::Keys" do
+      expect(Smartdc::Client.new.keys).to be_a Smartdc::Api::Keys
     end
   end
 
   describe ".datacenters" do
-    it "should return a Smartdc::Api::Datacenters" do
-      Smartdc::Client.new.datacenters.should be_a Smartdc::Api::Datacenters
+    it "is a Smartdc::Api::Datacenters" do
+      expect(Smartdc::Client.new.datacenters).to be_a Smartdc::Api::Datacenters
     end
   end
 
   describe ".datasets" do
-    it "should return a Smartdc::Api::Datasets" do
-      Smartdc::Client.new.datasets.should be_a Smartdc::Api::Datasets
+    it "is a Smartdc::Api::Datasets" do
+      expect(Smartdc::Client.new.datasets).to be_a Smartdc::Api::Datasets
     end
   end
 
   describe ".packages" do
-    it "should return a Smartdc::Api::Packages" do
-      Smartdc::Client.new.packages.should be_a Smartdc::Api::Packages
+    it "is a Smartdc::Api::Packages" do
+      expect(Smartdc::Client.new.packages).to be_a Smartdc::Api::Packages
     end
   end
 
   describe ".machines" do
-    it "should return a Smartdc::Api::Machines" do
-    	Smartdc::Client.new.machines.should be_a Smartdc::Api::Machines
+    it "is a Smartdc::Api::Machines" do
+    	expect(Smartdc::Client.new.machines).to be_a Smartdc::Api::Machines
     end
   end
 
   describe ".analytics" do
-    it "should return a Smartdc::Api::Analytics" do
-      Smartdc::Client.new.analytics.should be_a Smartdc::Api::Analytics
+    it "is a Smartdc::Api::Analytics" do
+      expect(Smartdc::Client.new.analytics).to be_a Smartdc::Api::Analytics
     end
   end
-end
+
+end

data/spec/unit/smartdc_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe "Smartdc" do
+describe Smartdc do
   describe ".new" do
-    it "should return a Smartdc::Client" do
-      Smartdc.new.should be_a Smartdc::Client
+    it "is a Smartdc::Client" do
+      expect(Smartdc.new).to be_a Smartdc::Client
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdc
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement