linode 0.7.10 → 0.8.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f2097732edf4e5731f5e8bc64005b902399c8612
+  data.tar.gz: 5571780e9bd4606927522ff98fdcd58fc4090709
+SHA512:
+  metadata.gz: 45f73884d9ffaa9e9ca0add89d4d6f629f01c55322d9747e5890d6237892a433f5d41000adae9d747e0c7145da90ab16eaf983f782c2267ac4ee4076e8d5be60
+  data.tar.gz: b0aad4d67cd46495579ab6de99ce76504b72d02cc5d7984502f5b2b6bf43b6e521def49fd557481091e3068ae45dc866554fbde1f168d2979e9cca1adc044642

data/.gitignore

@@ -0,0 +1,3 @@
+coverage/
+pkg/
+.rbenv*

data/.rspec

@@ -1,4 +1,4 @@
 --format
-s
+d
 --colour
 --backtrace

data/Gemfile

@@ -1,10 +1,10 @@
 source "http://rubygems.org"
 
 group :test do
-  gem "rake","0.8.7"
-  gem "rspec","2.4.0"
-  gem "mocha"
+  gem "rake", "~>10.0"
+  gem "rspec","~>2.0"
+  gem "mocha", "~>1.0"
 end
 
-gem "httparty"
-gem "json"
+gem "httparty", "~>0.0"
+gem "json", "~>1.0"

data/Gemfile.lock

@@ -0,0 +1,31 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    httparty (0.13.1)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    json (1.8.1)
+    metaclass (0.0.4)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_xml (0.5.5)
+    rake (10.3.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  httparty (~> 0.0)
+  json (~> 1.0)
+  mocha (~> 1.0)
+  rake (~> 10.0)
+  rspec (~> 2.0)

data/README.md

@@ -10,7 +10,7 @@
 
 ## RUNNING:
 
-Consult the Linode API guide here: [http://www.linode.com/api/autodoc.cfm](http://www.linode.com/api/autodoc.cfm)    
+Consult the Linode API guide here: [https://www.linode.com/api/](https://www.linode.com/api/)    
 You will need to get an API key (check your account profile).
 
 Here is an annoyingly exhaustive IRB session where I play around with the API:
@@ -143,4 +143,7 @@ irb> ^D@ Wed Aug 05 01:50:52 rick@Yer-Moms-Computer
 * Thanks to Musfuut ([musfuut](http://github.com/musfuut)) for diagnosing and recommending a fix for OpenStruct and 'type' data members in Linode returned results.
 * Thanks to mihaibirsan ([mihaibirsan](http://github.com/mihaibirsan)) for diagnosing a problem with dependencies on the 'crack' library.
 * Thanks to Adam Durana ([durana](http://github.com/durana)) for adding support for linode.ip.addprivate.
-* Thanks to Gustavo Beathyate ([goddamnhippie](http://github/goddamnhippie)) for markdownifying the README.
+* Thanks to Gustavo Beathyate ([goddamnhippie](http://github.com/goddamnhippie)) for markdownifying the README.
+* Thanks to Robbert Klarenbeek ([rubencaro](https://github.com/robbertkl)) for API updates.
+* Thanks to [rubencaro](https://github.com/rubencaro) for adding logger functionality.
+* Thanks to Marques Johansson [displague](https://github.com/displague) for API updates

data/Rakefile

@@ -19,20 +19,3 @@ end
 
 desc 'Test the linode library.'
 task :test => :spec
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "linode"
-    gemspec.summary = "a Ruby wrapper for the Linode API"
-    gemspec.description = "This is a wrapper around Linode's automation facilities."
-    gemspec.email = "rick@rickbradley.com"
-    gemspec.homepage = "http://github.com/rick/linode"
-    gemspec.authors = ["Rick Bradley"]
-    gemspec.add_dependency('httparty', '>= 0.4.4')
-    gemspec.add_dependency('crack', '>= 0.3.1')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-end
-

data/VERSION

@@ -1 +1 @@
-0.7.10
+0.8.1

data/lib/linode.rb

@@ -5,6 +5,7 @@ require 'json'
 
 class Linode
   attr_reader :username, :password
+  attr_accessor :logger
 
   def self.has_method(*actions)
     actions.each do |action|
@@ -28,7 +29,7 @@ class Linode
     end
   end
 
-  has_namespace :test, :avail, :user, :domain, :linode, :nodebalancer, :stackscript
+  has_namespace :test, :avail, :user, :domain, :linode, :nodebalancer, :stackscript, :account
 
   @@documentation_category = {}
 
@@ -50,11 +51,12 @@ class Linode
 
   def documentation_path(action)
      hits = action.match(/^(.*)\.[^.]+$/)
-    "http://www.linode.com/api/" + @@documentation_category[hits[1]] + '/' + action
+    "https://www.linode.com/api/" + @@documentation_category[hits[1]] + '/' + action
   end
 
   def initialize(args)
     @api_url = args[:api_url] if args[:api_url]
+    @logger = args[:logger]
 
     if args.include?(:api_key)
       @api_key = args[:api_key]
@@ -90,6 +92,7 @@ class Linode
   end
 
   def post(data)
+    logger.info "POST #{api_url.to_s} body:#{data.inspect}" if logger
     HTTParty.post(api_url, :body => data).parsed_response
   end
 

data/lib/linode/account.rb

@@ -0,0 +1,4 @@
+class Linode::Account < Linode
+  documentation_category 'account'
+  has_method :estimateinvoice, :info
+end

data/lib/linode/avail.rb

@@ -1,4 +1,4 @@
 class Linode::Avail < Linode
   documentation_category 'utility'
-  has_method :datacenters, :kernels, :linodeplans, :distributions, :stackscripts
-end
+  has_method :datacenters, :kernels, :linodeplans, :distributions, :stackscripts, :nodebalancers
+end

data/lib/linode/image.rb

@@ -0,0 +1,4 @@
+class Linode::Image < Linode
+  documentation_category 'image'
+  has_method :list, :delete
+end

data/lib/linode/linode.rb

@@ -1,5 +1,5 @@
 class Linode::Linode < Linode
   documentation_category "linode"
   has_namespace :config, :disk, :ip, :job
-  has_method :update, :create, :list, :shutdown, :boot, :delete, :reboot
-end
+  has_method :update, :create, :list, :shutdown, :boot, :delete, :reboot, :clone, :resize
+end

data/lib/linode/linode/disk.rb

@@ -1,4 +1,4 @@
 class Linode::Linode::Disk < Linode
   documentation_category 'linode'
-  has_method :update, :create, :list, :createfromdistribution, :createfromstackscript, :duplicate, :delete, :resize
-end
+  has_method :update, :create, :list, :createfromdistribution, :createfromimage, :createfromstackscript, :duplicate, :delete, :resize, :imagize
+end

data/lib/linode/linode/ip.rb

@@ -1,4 +1,4 @@
 class Linode::Linode::Ip < Linode
   documentation_category 'linode'
-  has_method :list, :addprivate
+  has_method :list, :addprivate, :addpublic, :setrdns, :swap
 end

data/linode.gemspec

@@ -1,86 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{linode}
-  s.version = "0.7.10"
+  s.name = "linode"
+  s.version = "0.8.1"
+  s.date = "2014-09-06"
+  s.description = "This is a wrapper around Linode's automation facilities."
+  s.summary = "a Ruby wrapper for the Linode API"
+  s.authors = ["Rick Bradley"]
+  s.email = "rick@rickbradley.com"
+  s.homepage = "http://github.com/rick/linode"
+  s.licenses = ["MIT"]
 
+  s.rubygems_version = "2.2.2"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Rick Bradley"]
-  s.date = %q{2012-10-19}
-  s.description = %q{This is a wrapper around Linode's automation facilities.}
-  s.email = %q{rick@rickbradley.com}
+  s.require_paths = ["lib"]
+
   s.extra_rdoc_files = [
     "README.md"
   ]
-  s.files = [
-    ".rspec",
-    "CHANGELOG",
-    "Gemfile",
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "autotest/discover.rb",
-    "lib/linode.rb",
-    "lib/linode/avail.rb",
-    "lib/linode/domain.rb",
-    "lib/linode/domain/resource.rb",
-    "lib/linode/linode.rb",
-    "lib/linode/linode/config.rb",
-    "lib/linode/linode/disk.rb",
-    "lib/linode/linode/ip.rb",
-    "lib/linode/linode/job.rb",
-    "lib/linode/nodebalancer.rb",
-    "lib/linode/nodebalancer/config.rb",
-    "lib/linode/nodebalancer/node.rb",
-    "lib/linode/stackscript.rb",
-    "lib/linode/test.rb",
-    "lib/linode/user.rb",
-    "linode.gemspec",
-    "spec/linode/avail_spec.rb",
-    "spec/linode/domain/resource_spec.rb",
-    "spec/linode/domain_spec.rb",
-    "spec/linode/linode/config_spec.rb",
-    "spec/linode/linode/disk_spec.rb",
-    "spec/linode/linode/ip_spec.rb",
-    "spec/linode/linode/job_spec.rb",
-    "spec/linode/linode_spec.rb",
-    "spec/linode/nodebalancer/config_spec.rb",
-    "spec/linode/nodebalancer/node_spec.rb",
-    "spec/linode/nodebalancer_spec.rb",
-    "spec/linode/stackscript_spec.rb",
-    "spec/linode/test_spec.rb",
-    "spec/linode/user_spec.rb",
-    "spec/linode_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/rick/linode}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{a Ruby wrapper for the Linode API}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  # Manifest
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0.4.4"])
-      s.add_runtime_dependency(%q<crack>, [">= 0.3.1"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<httparty>, [">= 0.4.4"])
-      s.add_dependency(%q<crack>, [">= 0.3.1"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<httparty>, [">= 0.4.4"])
-    s.add_dependency(%q<crack>, [">= 0.3.1"])
-  end
+  s.add_runtime_dependency(%q<httparty>, ["~> 0.0"])
+  s.add_runtime_dependency(%q<json>, ["~> 1.0"])
+  s.add_runtime_dependency(%q<crack>, ["~> 0.0"])
 end
 

data/spec/linode/account_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require 'linode'
+
+describe Linode::Account do
+  before :each do
+    @api_key = 'foo'
+    @linode = Linode::Account.new(:api_key => @api_key)
+  end
+
+  it 'should be a Linode instance' do
+    @linode.class.should < Linode
+  end
+
+  %w(estimateinvoice info).each do |action|
+    it "should allow accessing the #{action} API" do
+      @linode.should respond_to(action.to_sym)
+    end
+
+    describe "when accessing the #{action} API" do
+      it 'should allow a data hash' do
+        @linode.stubs(:send_request)
+        lambda { @linode.send(action.to_sym, {}) }.should_not raise_error
+      end
+
+      it 'should not require arguments' do
+        @linode.stubs(:send_request)
+        lambda { @linode.send(action.to_sym) }.should_not raise_error
+      end
+
+      it "should request the account.#{action} action" do
+        @linode.expects(:send_request).with {|api_action, data| api_action == "account.#{action}" }
+        @linode.send(action.to_sym)
+      end
+
+      it 'should provide the data hash when making its request' do
+        @linode.expects(:send_request).with {|api_action, data| data = { :foo => :bar } }
+        @linode.send(action.to_sym, {:foo => :bar})
+      end
+
+      it 'should return the result of the request' do
+        @linode.expects(:send_request).returns(:bar => :baz)
+        @linode.send(action.to_sym).should == { :bar => :baz }
+      end
+
+      it "should consider the documentation to live at https://www.linode.com/api/account/account.#{action}" do
+        @linode.documentation_path(Linode.action_path(@linode.class.name, action)).should == "https://www.linode.com/api/account/account.#{action}"
+      end
+    end
+  end
+end

data/spec/linode/avail_spec.rb

@@ -6,42 +6,44 @@ describe Linode::Avail do
     @api_key = 'foo'
     @linode = Linode::Avail.new(:api_key => @api_key)
   end
-  
+
   it 'should be a Linode instance' do
     @linode.class.should < Linode
   end
-  
-  %w(datacenters kernels linodeplans distributions stackscripts).each do |action|
+
+  %w(datacenters kernels linodeplans distributions stackscripts nodebalancers).each do |action|
     it "should allow accessing the #{action} API" do
       @linode.should respond_to(action.to_sym)
     end
-  
+
     describe "when accessing the #{action} API" do
       it 'should allow a data hash' do
-        lambda { @linode.send(action.to_sym, {}) }.should_not raise_error(ArgumentError)
+        @linode.stubs(:send_request)
+        lambda { @linode.send(action.to_sym, {}) }.should_not raise_error
       end
-    
+
       it 'should not require arguments' do
-        lambda { @linode.send(action.to_sym) }.should_not raise_error(ArgumentError)      
+        @linode.stubs(:send_request)
+        lambda { @linode.send(action.to_sym) }.should_not raise_error
       end
-    
+
       it "should request the avail.#{action} action" do
         @linode.expects(:send_request).with {|api_action, data| api_action == "avail.#{action}" }
         @linode.send(action.to_sym)
       end
-    
+
       it 'should provide the data hash when making its request' do
         @linode.expects(:send_request).with {|api_action, data| data = { :foo => :bar } }
         @linode.send(action.to_sym, {:foo => :bar})
       end
-    
+
       it 'should return the result of the request' do
-        @linode.expects(:send_request).returns(:bar => :baz)      
-        @linode.send(action.to_sym).should == { :bar => :baz }      
+        @linode.expects(:send_request).returns(:bar => :baz)
+        @linode.send(action.to_sym).should == { :bar => :baz }
       end
-      
-      it "should consider the documentation to live at http://www.linode.com/api/utility/avail.#{action}" do
-        @linode.documentation_path(Linode.action_path(@linode.class.name, action)).should == "http://www.linode.com/api/utility/avail.#{action}"
+
+      it "should consider the documentation to live at https://www.linode.com/api/utility/avail.#{action}" do
+        @linode.documentation_path(Linode.action_path(@linode.class.name, action)).should == "https://www.linode.com/api/utility/avail.#{action}"
       end
     end
   end

data/spec/linode/domain/resource_spec.rb

@@ -6,42 +6,44 @@ describe Linode::Domain::Resource do
     @api_key = 'foo'
     @linode = Linode::Domain::Resource.new(:api_key => @api_key)
   end
-  
+
   it 'should be a Linode instance' do
     @linode.class.should < Linode
   end
-  
+
   %w(create delete update list).each do |action|
     it "should allow accessing the #{action} API" do
       @linode.should respond_to(action.to_sym)
     end
-  
+
     describe "when accessing the #{action} API" do
       it 'should allow a data hash' do
-        lambda { @linode.send(action.to_sym, {}) }.should_not raise_error(ArgumentError)
+        @linode.stubs(:send_request)
+        lambda { @linode.send(action.to_sym, {}) }.should_not raise_error
       end
-    
+
       it 'should not require arguments' do
-        lambda { @linode.send(action.to_sym) }.should_not raise_error(ArgumentError)      
+        @linode.stubs(:send_request)
+        lambda { @linode.send(action.to_sym) }.should_not raise_error
       end
-    
+
       it "should request the avail.#{action} action" do
         @linode.expects(:send_request).with {|api_action, data| api_action == "domain.resource.#{action}" }
         @linode.send(action.to_sym)
       end
-    
+
       it 'should provide the data hash when making its request' do
         @linode.expects(:send_request).with {|api_action, data| data = { :foo => :bar } }
         @linode.send(action.to_sym, {:foo => :bar})
       end
-    
+
       it 'should return the result of the request' do
-        @linode.expects(:send_request).returns(:bar => :baz)      
-        @linode.send(action.to_sym).should == { :bar => :baz }      
+        @linode.expects(:send_request).returns(:bar => :baz)
+        @linode.send(action.to_sym).should == { :bar => :baz }
       end
-      
-      it "should consider the documentation to live at http://www.linode.com/api/dns/domain.resource.#{action}" do
-        @linode.documentation_path(Linode.action_path(@linode.class.name, action)).should == "http://www.linode.com/api/dns/domain.resource.#{action}"
+
+      it "should consider the documentation to live at https://www.linode.com/api/dns/domain.resource.#{action}" do
+        @linode.documentation_path(Linode.action_path(@linode.class.name, action)).should == "https://www.linode.com/api/dns/domain.resource.#{action}"
       end
     end
   end