fog 0.2.14 → 0.2.15

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.2.14'
-  s.date              = '2010-07-13'
+  s.version           = '0.2.15'
+  s.date              = '2010-07-17'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -242,6 +242,11 @@ Gem::Specification.new do |s|
     lib/fog/linode/requests/avail_distributions.rb
     lib/fog/linode/requests/avail_kernels.rb
     lib/fog/linode/requests/avail_linodeplans.rb
+    lib/fog/linode/requests/avail_stackscripts.rb
+    lib/fog/linode/requests/linode_create.rb
+    lib/fog/linode/requests/linode_delete.rb
+    lib/fog/linode/requests/linode_list.rb
+    lib/fog/linode/requests/linode_reboot.rb
     lib/fog/local.rb
     lib/fog/local/bin.rb
     lib/fog/local/models/directories.rb

data/lib/fog.rb

@@ -40,7 +40,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.14'
+    VERSION = '0.2.15'
   end
 
   module Mock

data/lib/fog/linode.rb

@@ -11,6 +11,11 @@ module Fog
     request 'avail_distributions'
     request 'avail_kernels'
     request 'avail_linodeplans'
+    request 'avail_stackscripts'
+    request 'linode_create'
+    request 'linode_delete'
+    request 'linode_list'
+    request 'linode_reboot'
 
     class Mock
       include Collections

data/lib/fog/linode/requests/avail_distributions.rb

@@ -24,7 +24,7 @@ module Fog
 
     class Mock
 
-      def avail_distributions(distribution_id)
+      def avail_distributions(options={})
         Fog::Mock.not_implemented
       end
 

data/lib/fog/linode/requests/avail_kernels.rb

@@ -25,7 +25,7 @@ module Fog
 
     class Mock
 
-      def avail_kernels(distribution_id)
+      def avail_kernels(options={})
         Fog::Mock.not_implemented
       end
 

data/lib/fog/linode/requests/avail_stackscripts.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Linode
+    class Real
+
+      # Get available stack scripts
+      #
+      # ==== Parameters
+      # * options<~Hash>:
+      #   * distributionId<~Integer>: Limit the results to Stackscripts that can be applied to this distribution id
+      #   * distributionVendor<~String>: Debian, Ubuntu, Fedora, etc.
+      #   * keywords<~String>: Search terms
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def avail_stackscripts(options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => { :api_action => 'avail.stackscripts' }.merge!(options)
+        )
+      end
+
+    end
+
+    class Mock
+
+      def avail_stackscripts(options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/linode_create.rb

@@ -0,0 +1,39 @@
+module Fog
+  module Linode
+    class Real
+
+      # Creates a linode and assigns you full privileges
+      #
+      # ==== Parameters
+      # * datacenter_id<~Integer>: id of datacenter to place new linode in
+      # * payment_term<~Integer>: Subscription term in months, in [1, 12, 24]
+      # * plan_id<~Integer>: id of plan to boot new linode with
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def linode_create(datacenter_id, payment_term, plan_id)
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => {
+            :api_action   => 'linode.create',
+            :datacenterId => datacenter_id,
+            :paymentTerm  => payment_term,
+            :planId       => plan_id
+          }
+        )
+      end
+
+    end
+
+    class Mock
+
+      def linode_create(datacenter_id, payment_term, plan_id)
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/linode_delete.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Linode
+    class Real
+
+      # List all linodes user has access or delete to
+      #
+      # ==== Parameters
+      # * linode_id<~Integer>: id of linode to delete
+      # * options<~Hash>:
+      #   * skipChecks<~Boolean>: skips safety checks and always deletes
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def linode_delete(linode_id, options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => { :api_action => 'linode.delete', :linodeId => linode_id }.merge!(options)
+        )
+      end
+
+    end
+
+    class Mock
+
+      def linode_delete(linode_id, options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/linode_list.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Linode
+    class Real
+
+      # List all linodes user has access or delete to
+      #
+      # ==== Parameters
+      # * options<~Hash>:
+      #   * linodeId<~Integer>: Limit the list to the specified LinodeID
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def linode_list(options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => { :api_action => 'linode.list' }.merge!(options)
+        )
+      end
+
+    end
+
+    class Mock
+
+      def linode_list(options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/linode_reboot.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Linode
+    class Real
+
+      # Issues a shutdown, and then a boot job for a given linode
+      #
+      # ==== Parameters
+      # * linode_id<~Integer>: id of linode to reboot
+      # * options<~Hash>:
+      #   * configId<~Boolean>: id of config to boot server with
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def linode_reboot(linode_id, options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => { :api_action => 'linode.reboot', :linodeId => linode_id }.merge!(options)
+        )
+      end
+
+    end
+
+    class Mock
+
+      def linode_reboot(linode_id, options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/files.rb

@@ -107,7 +107,7 @@ module Fog
             :host     => @cdn_host,
             :path     => "#{@cdn_path}/#{params[:path]}",
           }))
-          unless response.body.empty?
+          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
             response.body = JSON.parse(response.body)
           end
           response
@@ -122,7 +122,7 @@ module Fog
             :host     => @storage_host,
             :path     => "#{@storage_path}/#{params[:path]}",
           }), &block)
-          if !response.body.empty? && parse_json && response.headers['Content-Type'] == 'application/json'
+          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
             response.body = JSON.parse(response.body)
           end
           response

data/lib/fog/rackspace/models/files/files.rb

@@ -17,7 +17,7 @@ module Fog
         def all(options = {})
           merge_attributes(options)
           parent = directory.collection.get(
-            directory.name,
+            directory.key,
             options
           )
           if parent

data/spec/rackspace/requests/files/get_container_spec.rb

@@ -25,8 +25,10 @@ describe 'Rackspace::Files.get_container' do
   end
   describe 'failure' do
 
-    it "should not raise an if the container does not exist" do
-      Rackspace[:files].get_container('container_name')
+    it "should raise a NotFound error if the container does not exist" do
+      lambda do
+        Rackspace[:files].get_container('container_name')
+      end.should raise_error(Excon::Errors::NotFound)
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 14
-  version: 0.2.14
+  - 15
+  version: 0.2.15
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -07:00
+date: 2010-07-17 00:00:00 -05:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -331,6 +331,11 @@ files:
 - lib/fog/linode/requests/avail_distributions.rb
 - lib/fog/linode/requests/avail_kernels.rb
 - lib/fog/linode/requests/avail_linodeplans.rb
+- lib/fog/linode/requests/avail_stackscripts.rb
+- lib/fog/linode/requests/linode_create.rb
+- lib/fog/linode/requests/linode_delete.rb
+- lib/fog/linode/requests/linode_list.rb
+- lib/fog/linode/requests/linode_reboot.rb
 - lib/fog/local.rb
 - lib/fog/local/bin.rb
 - lib/fog/local/models/directories.rb