bbcloud 0.11.2 → 0.12.0

data/.gitignore

@@ -1,3 +1,4 @@
-pkg/*
-*.gem
 .bundle
+Gemfile.lock
+local
+vendor/fog-0.8.2/

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/README

@@ -7,11 +7,21 @@ http://beta.brightbox.com
 
 http://docs.brightbox.com/cli
 
+== Dependencies
+
+It has following dependencies and if you are trying to install the gem from 
+a gem file (rather than via gem command), you might have to install the 
+following:
+
+* fog - 0.8.2
+* json - 1.5.3
+* hirb - 0.3.5
+
 == Packaging
 
 === Vendoring libraries
 
-gems can be vendored into lib/bbcloud/vendor for packaging and will be
+gems can be vendored into vendor/ for packaging and will be
 prioritized over any gems.
 
 === Debian/Ubuntu packaging

data/README.rdoc

@@ -7,11 +7,21 @@ http://beta.brightbox.com
 
 http://docs.brightbox.com/cli
 
+== Dependencies
+
+It has following dependencies and if you are trying to install the gem from 
+a gem file (rather than via gem command), you might have to install the 
+following:
+
+* fog - 0.8.2
+* json - 1.5.3
+* hirb - 0.3.5
+
 == Packaging
 
 === Vendoring libraries
 
-gems can be vendored into lib/bbcloud/vendor for packaging and will be
+gems can be vendored into vendor/ for packaging and will be
 prioritized over any gems.
 
 === Debian/Ubuntu packaging

data/Rakefile

@@ -1,2 +1,14 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+bbcloud_path = File.expand_path('./lib', File.dirname(__FILE__))
+$:.unshift(bbcloud_path)
+require "bbcloud/command_generator"
+
+desc "generate brightbox-commands"
+task :generate_commands do
+  Brightbox::CommandGenerator.new(bbcloud_path)
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new

data/bbcloud.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-	# To work around a bug with json using the wrong json_pure
-	s.add_dependency 'json', '=1.4.6'
-	s.add_dependency 'json_pure', '=1.4.6'
-
-	s.add_dependency 'gli', '1.2.5'
-	s.add_dependency 'hirb', '0.3.5'
-	s.add_dependency 'formatador', '=0.0.16'
-	s.add_dependency 'excon', '=0.5.6'
-	s.add_dependency 'ini', '0.1.1'
-
+  s.add_dependency 'json', '~> 1.5.3'
+  s.add_dependency 'hirb', '0.3.5'
+  s.add_dependency 'formatador', '~> 0.1.4'
+  s.add_dependency 'excon', '~> 0.6.1'
+  s.add_dependency 'fog', '~> 0.8.0'
+  s.add_development_dependency('rake', '~> 0.8.0')
+  s.add_development_dependency('vcr')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('mocha')
 end
+

data/bin/brightbox-accounts

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/bin/brightbox-cloudips

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/bin/brightbox-config

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/bin/brightbox-images

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/bin/brightbox-lbs

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/bin/brightbox-servers

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/bin/brightbox-types

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/bin/brightbox-users

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/bin/brightbox-zones

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-  require "bbcloud/cli"
+  require "bbcloud"
 rescue LoadError
   bbcloud_path = File.expand_path('../../lib', __FILE__)
   $:.unshift(bbcloud_path)
-  require "bbcloud/cli"
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
 end

data/lib/bbcloud.rb

@@ -0,0 +1,43 @@
+lib_dir = File.expand_path(File.dirname(__FILE__))
+
+$LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include?(lib_dir)
+
+os_config = File.join(lib_dir,"bbcloud","os_config.rb")
+require os_config if File.exist? os_config
+
+vendor_dir = File.expand_path(File.join(lib_dir, 'bbcloud','vendor'))
+
+unless defined?(DISABLE_RUBYGEMS)
+  require "rubygems"
+  gem "json", "~> 1.5.3"
+  gem "fog", "~> 0.8.0"
+end
+
+# Add any vendored libraries into search path
+Dir.glob(vendor_dir + '/*').each do |f|
+  $:.unshift File.join(f, 'lib')
+end
+
+require "json"
+require 'date'
+require 'gli'
+require 'fog'
+
+
+require 'bbcloud/tables'
+require "bbcloud/fog_extensions"
+require "bbcloud/logging"
+require "bbcloud/api"
+require "bbcloud/servers"
+require "bbcloud/images"
+require "bbcloud/types"
+require "bbcloud/zones"
+require "bbcloud/cloud_ips"
+require "bbcloud/users"
+require "bbcloud/accounts"
+require "bbcloud/config"
+require "bbcloud/version"
+require "bbcloud/load_balancers"
+require "bbcloud/ruby_core_ext"
+require "bbcloud/error_parser"
+

data/lib/bbcloud/accounts.rb

@@ -5,10 +5,12 @@ module Brightbox
       [ram_limit.to_i - ram_used.to_i, 0].max
     end
 
+    def cloud_ip_limit
+      attributes['cloud_ips_limit']
+    end
+
     def to_row
-      attributes.merge({ :ram_free => ram_free, 
-                         :cloud_ip_limit => limits_cloudips
-                       })
+      attributes.merge(:ram_free => ram_free, :cloud_ip_limit => cloud_ip_limit)
     end
 
     def self.all

data/lib/bbcloud/command_generator.rb

@@ -0,0 +1,50 @@
+module Brightbox
+  class CommandGenerator
+    COMMAND_LIST = [
+      'brightbox-accounts',
+      'brightbox-cloudips',
+      'brightbox-config',
+      'brightbox-images',
+      'brightbox-lbs',
+      'brightbox-servers',
+      'brightbox-types',
+      'brightbox-users',
+      'brightbox-zones'
+    ]
+
+    def initialize(bbcloud_path)
+      @bbcloud_path = bbcloud_path
+      COMMAND_LIST.each do |command|
+        File.open("#{cli_binary_path}/#{command}","w+") do |fl|
+          fl.write(command_template)
+        end
+      end
+    end
+
+    private
+    def command_template
+      brightbox_command =<<-EOF
+#!/usr/bin/env ruby
+
+begin
+  require "bbcloud"
+rescue LoadError
+  bbcloud_path = File.expand_path('../../lib', __FILE__)
+  $:.unshift(bbcloud_path)
+  require "bbcloud"
+end
+
+Brightbox::BBConfig.config do
+  include GLI
+  run ARGV
+end
+      EOF
+      brightbox_command
+    end
+
+    def cli_binary_path
+      File.join(@bbcloud_path,"..","bin")
+    end
+    
+  end
+end

data/lib/bbcloud/commands/accounts-list.rb

@@ -1,16 +1,18 @@
-desc 'List accounts'
-arg_name '[account-id...]'
-command [:list] do |c|
-  c.action do |global_options, options, args|
+module Brightbox
+  desc 'List accounts'
+  arg_name '[account-id...]'
+  command [:list] do |c|
+    c.action do |global_options, options, args|
 
-    if args.empty?
-      accounts = Account.find(:all)
-    else
-      accounts = Account.find_or_call(args) do |id|
-        warn "Couldn't find account #{id}"
+      if args.empty?
+        accounts = Account.find(:all)
+      else
+        accounts = Account.find_or_call(args) do |id|
+          warn "Couldn't find account #{id}"
+        end
       end
-    end
 
-    render_table(accounts, global_options)
+      render_table(accounts, global_options)
+    end
   end
 end

data/lib/bbcloud/commands/accounts-reset-ftp-password.rb

@@ -1,33 +1,36 @@
-desc 'Reset FTP Library password'
-arg_name 'account-id...'
-command [:reset_ftp_password] do |c|
+module Brightbox
+  desc 'Reset FTP Library password'
+  arg_name 'account-id...'
+  command [:reset_ftp_password] do |c|
 
-  c.action do |global_options,options,args|
+    c.action do |global_options,options,args|
 
-    if args.empty?
-      raise "You must specify the accounts to reset ftp passwords for"
-    end
+      if args.empty?
+        raise "You must specify the accounts to reset ftp passwords for"
+      end
 
-    accounts = Account.find_or_call(args) do |id|
-      raise "Couldn't find account #{id}"
-    end
+      accounts = Account.find_or_call(args) do |id|
+        raise "Couldn't find account #{id}"
+      end
 
-    rows = []
+      rows = []
 
-    accounts.each do |s|
-      info "Resetting ftp password for #{s}"
-      new_password = s.reset_ftp_password
-      o = s.to_row
-      o[:library_ftp_password] = new_password
-      rows << o
-    end
+      accounts.each do |s|
+        info "Resetting ftp password for #{s}"
+        new_password = s.reset_ftp_password
+        o = s.to_row
+        o[:library_ftp_password] = new_password
+        rows << o
+      end
 
-    table_opts = global_options.merge({
-      :vertical => true,
-      :fields => [:id, :name, :library_ftp_host, :library_ftp_user, :library_ftp_password ]
-    })
+      table_opts = global_options.merge({
+        :vertical => true,
+        :fields => [:id, :name, :library_ftp_host, :library_ftp_user, :library_ftp_password ]
+      })
 
-    render_table(rows, table_opts)
+      render_table(rows, table_opts)
 
+    end
   end
 end
+