profitbricks 0.4.1 → 0.5.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+=== 0.5.0 / 2012-04-11
+
+* 2 major enhancements:
+
+  * Added a binary profitbricks to use the API from the command line
+  * DataCenter.create now excepts a Hash
+
 === 0.4.1 / 2012-04-11
 
 * 1 bug fix:

data/Manifest.txt

@@ -10,6 +10,7 @@ Rakefile
 bin/profitbricks
 examples/create_datacenter.rb
 lib/profitbricks.rb
+lib/profitbricks/cli.rb
 lib/profitbricks/config.rb
 lib/profitbricks/data_center.rb
 lib/profitbricks/extensions.rb
@@ -132,6 +133,7 @@ spec/fixtures/update_server/basic.json
 spec/fixtures/update_server/basic.xml
 spec/fixtures/update_storage/success.json
 spec/fixtures/update_storage/success.xml
+spec/profitbricks/cli_spec.rb
 spec/profitbricks/data_center_spec.rb
 spec/profitbricks/firewall_spec.rb
 spec/profitbricks/image_spec.rb

data/README.md

@@ -1,4 +1,4 @@
-# Profitbricks [![Build Status](https://secure.travis-ci.org/dsander/profitbricks.png)](http://travis-ci.org/dsander/profitbricks)
+# Profitbricks [![Build Status](https://secure.travis-ci.org/dsander/profitbricks.png?branch=master)](http://travis-ci.org/dsander/profitbricks)
 
 * http://github.com/dsander/profitbricks
 * http://rubydoc.info/github/dsander/profitbricks/master/frames
@@ -29,7 +29,7 @@ Get a list of all your Datacenters
 
 Create a new Datacenter
 
-	dc = DataCenter.create('Name')
+	dc = DataCenter.create(:name => 'Name')
 
 Find a Datacenter by name
 
@@ -45,6 +45,22 @@ or
 
 Check out the examples directory for more detailed usage information, or have a look at the [documentation](http://rubydoc.info/github/dsander/profitbricks/master/frames) for the class reference.
 
+## CLI
+
+To use the profitbricks binary you first have to store your username and password in environment variables
+ 	
+ 	export PROFITBRICKS_USER=yourusername
+ 	export PROFITBRICKS_PASSWORD=yourpassword
+
+The binary always takes at least two arguments. The first represents a class name (in snake- or camel-case) and the second a method name of this class.
+Get a list of all your datacenters:
+ 	
+ 	profitbricks data_center all
+
+The following arguments are coverted into a Hash and passed to the method, if you want to call instance methods you _have_ to provide the id of the Server/DataCenter, etc:
+ 	
+ 	profitbricks server update id=03h17g46-3040-d1af-bb01-9579fe0300e7 cores=2 ram=1024
+
 ## License
 (The MIT License)
 

data/bin/profitbricks

@@ -1,3 +1,7 @@
 #!/usr/bin/env ruby
 
-abort "you need to write me"
+require 'profitbricks'
+require 'profitbricks/cli'
+
+cli = Profitbricks::CLI.new()
+exit cli.run(ARGV)

data/examples/create_datacenter.rb

@@ -13,7 +13,7 @@ end
 # * and a database server 
 #
 
-dc = DataCenter.create('Example Project')
+dc = DataCenter.create(:name => 'Example Project')
 dc.wait_for_provisioning
 
 debian = Image.find(:name => "profitbricks-debian-squeeze-EN-6.0.1a-amd64.img")

data/lib/profitbricks.rb

@@ -13,7 +13,7 @@ require 'profitbricks/firewall'
 require 'profitbricks/rule'
 
 module Profitbricks
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end
 
 PB = Profitbricks

data/lib/profitbricks/cli.rb

@@ -0,0 +1,107 @@
+require 'optparse'
+require 'pp'
+
+module Profitbricks
+  class CLI
+    attr_accessor :stdout
+
+    def initialize(stdout = $stdout)
+      @options = {:debug => false}
+      @stdout = stdout
+    end
+
+    def run(options)
+      options = OptionParser.new do |opts|
+        opts.banner = "Usage: profitbricks [options] <class> <method> argument=value argument2=value2 .."
+        opts.separator ""
+        opts.separator "You have to supply your Profitbricks user name and password in the environmental variables PROFITBRICKS_USER and PROFITBRICKS_PASSWORD"
+        opts.separator ""
+        opts.on("-d", "--debug", "Enable debugging output") do |d|
+          @options[:debug] = d
+        end
+        opts.on_tail("-h", "--help", "Show this message") do
+          @stdout.puts opts
+          return -1
+        end
+        if !ENV['PROFITBRICKS_USER'] or !ENV['PROFITBRICKS_PASSWORD'] or options.length < 2
+          @stdout.puts opts
+          return -1
+        end
+
+      end.parse!(options)
+
+      Profitbricks.configure do |config|
+        config.username = ENV['PROFITBRICKS_USER']
+        config.password = ENV['PROFITBRICKS_PASSWORD']
+        config.log = @options[:debug]
+      end
+      
+      (klass, m, arguments) = convert_arguments(options)
+
+      begin
+        klass = Profitbricks.get_class(klass)
+      rescue LoadError
+        @stdout.puts "Invalid class name #{klass}."
+        return -1
+      end
+      
+      if method = get_singleton_method(klass, m)
+        dump = PP.pp(call_singleton_method(klass, m, arguments), "")
+        @stdout.puts dump
+      elsif method = get_instance_method(klass, m)
+        dump = PP.pp(call_instance_method(klass, m, arguments), "")
+        @stdout.puts dump
+      else
+        @stdout.puts "#{klass} has no method #{m}"
+        return -1
+      end
+      return 0
+    end
+
+
+    def convert_arguments(options)
+      arguments = Hash[options[2..-1].collect { |x| 
+        a = x.split('=');
+        a[1] = a[1].to_i if a[1] =~ /^\d+$/
+        [a[0].to_sym, a[1]]  
+      }]
+      [options[0], options[1], arguments]
+    end
+    
+    def get_singleton_method(klass, method)
+      methods = klass.singleton_methods(false)
+      if methods.collect { |m| m.to_sym }.include?(method.to_sym)
+        return klass.method(method.to_sym)
+      end
+    end
+
+    def get_instance_method(klass, method)
+      obj = klass.send(:new, {})
+      methods = obj.public_methods(false)
+      if methods.collect { |m| m.to_sym }.include?(method.to_sym)
+        return obj.method(method)
+      end
+    end
+
+    def call_singleton_method(klass, method, arguments)
+      call_method(klass, method, arguments)
+    end
+
+    def call_instance_method(klass, method, arguments)
+      id = arguments.delete(:id)
+      obj = klass.send(:find, {:id => id})
+      call_method(obj, method, arguments)
+    end
+
+    def call_method(klass, method, arguments)
+      if arguments.length > 0
+        klass.send(method, arguments)
+      else
+        klass.send(method)
+     end
+   end
+
+    class << self
+    end
+  end
+end

data/lib/profitbricks/data_center.rb

@@ -75,10 +75,11 @@ module Profitbricks
       
       # Creates and saves a new, empty Virtual Data Center.
       #
-      # @param [String] Name of the Virtual Data Center (can not start with or contain (@, /, \\, |, ", '))
+      # @param [Hash] options 
+      # @option options [String] :name Name of the Virtual Data Center (can not start with or contain (@, /, \\, |, ", '))
       # @return [DataCenter] The newly created Virtual Data Center
-      def create(name)
-        response = Profitbricks.request :create_data_center, "<dataCenterName>#{name}</dataCenterName>"
+      def create(options)
+        response = Profitbricks.request :create_data_center, "<dataCenterName>#{options[:name]}</dataCenterName>"
         self.find(:id => response.to_hash[:create_data_center_response][:return][:data_center_id] )
       end
 

data/spec/profitbricks/cli_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'profitbricks/cli'
+
+describe Profitbricks::CLI do
+  include Savon::Spec::Macros
+
+  before(:all) do
+    ENV['PROFITBRICKS_USER'] = 'bogus'
+    ENV['PROFITBRICKS_PASSWORD'] = 'bogus'
+  end
+  let(:cli) { Profitbricks::CLI.new(StringIO.new) }
+  
+  it "should return with no username and password" do
+    ENV.delete('PROFITBRICKS_USER')
+    cli.run(["data_center", "all"]).should == -1
+    ENV['PROFITBRICKS_USER'] = 'bogus'
+  end
+
+  it "should require at least to arguments" do
+    cli.run(["data_center"]).should == -1
+  end
+
+  it "should display the help message" do
+    cli.run(["-h bogus"]).should == -1
+  end
+
+  it "should abort with a invalid class" do
+    cli.run(%w(bogus fail)).should == -1
+  end
+
+  it "should abort with a invalid method" do
+    cli.run(%w(server fail)).should == -1
+  end
+
+  it "should convert the arguments to a hash" do
+    args = %w(data_center create id=12 name=Test)
+    (klass, m, arguments) = cli.convert_arguments(args)
+    klass.should == "data_center"
+    m.should == "create"
+    arguments.class.should == Hash
+    arguments[:id].should == 12
+    arguments[:name].should == "Test"
+  end
+
+  it "should get a singleton method" do
+    method = cli.get_singleton_method(Profitbricks::DataCenter, 'all')
+    method.should == Profitbricks::DataCenter.method('all')
+  end
+
+  it "should get a instance method" do
+    method = cli.get_instance_method(Profitbricks::Server, 'update')
+    method.to_s.should == Profitbricks::Server.new({}).method('update').to_s
+  end
+
+  it "should get all data centers" do
+    savon.expects(:get_all_data_centers).returns(:test_datacenter)
+    savon.expects(:get_data_center).returns(:two_servers_with_storage)
+    cli.run(%w(data_center all)).should == 0
+  end
+
+  it "should update a server" do
+    savon.expects(:get_server).returns(:after_create)
+    savon.expects(:update_server).returns(:basic)
+    cli.run(%w(server update id=1234-123 name=meme ram=256 cores=1)).should == 0
+  end
+end

data/spec/profitbricks/data_center_spec.rb

@@ -6,7 +6,7 @@ describe Profitbricks::DataCenter do
   it "should create a new datacenter" do
     savon.expects(:create_data_center).returns(:success)
     savon.expects(:get_data_center).returns(:create)
-    dc = DataCenter.create('Test2')
+    dc = DataCenter.create(:name => 'Test2')
     dc.name.should == 'Test2'
     dc.id.should == "b3eebede-5c78-417c-b1bc-ff5de01a0602"
     dc.version.should == 9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: profitbricks
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &22770020 !ruby/object:Gem::Requirement
+  requirement: &17993060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22770020
+  version_requirements: *17993060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &22769000 !ruby/object:Gem::Requirement
+  requirement: &17990940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *22769000
+  version_requirements: *17990940
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &22768260 !ruby/object:Gem::Requirement
+  requirement: &17989460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *22768260
+  version_requirements: *17989460
 description: A Ruby client for the ProfitBricks API.
 email:
 - git@dsander.de
@@ -65,6 +65,7 @@ files:
 - bin/profitbricks
 - examples/create_datacenter.rb
 - lib/profitbricks.rb
+- lib/profitbricks/cli.rb
 - lib/profitbricks/config.rb
 - lib/profitbricks/data_center.rb
 - lib/profitbricks/extensions.rb
@@ -187,6 +188,7 @@ files:
 - spec/fixtures/update_server/basic.xml
 - spec/fixtures/update_storage/success.json
 - spec/fixtures/update_storage/success.xml
+- spec/profitbricks/cli_spec.rb
 - spec/profitbricks/data_center_spec.rb
 - spec/profitbricks/firewall_spec.rb
 - spec/profitbricks/image_spec.rb