rumm 0.0.23 → 0.0.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGFlNzA2ZWMyM2RmMjBkZWNlZTk5MzVmMzRkNjFmMGVkNGZiNjQ4Mw==
+    YmQzNjJhOTY2NWQwYjdlZTg2ZGRlNWRjZDE1MTczMmRhMWE0ZWQyNg==
   data.tar.gz: !binary |-
-    NWIwMWU3MjNhNjAxYTQ5MDVkNmNjMmMwM2MwYTBkZDkzZDk5ZDI2Zg==
+    OTQ1MTFmNzRmMzI0NDliYmFjMDYxZmY5YTMwNTllNTAyMDQ5NTZjYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzljYjhkYTc1ZDg3ZDNhZGI0NDMyNWNjOTIyN2I1M2JkNWU4NDY1OTI4NzI4
-    ZjU0NzMwMzk3ZTA5MDQ4NzViNThjNTQwZTQ2ZWUzNmNjYTFiNzliNGE3N2U0
-    MTkwM2U1ZDgwMTg0NjA2YjQ3NjczMTQ1OWNiOWVlODYzZDlkZmY=
+    ZDEwOTk4MGFiMzQ1N2Y1ZmJlZTExNjU5MzAwNDBkY2VlZDY0MjY2NjBhNzhl
+    MzEzZDgzYzdiMTBkMDFiMTVhNTNhZjYzMDZhZmY2MzIwN2M3YTllMWYzNzU4
+    NGI0YjRmNGQyN2ZlY2QyZGEyZmUzYWFhYmJlNjdjMDdkZWYxYmE=
   data.tar.gz: !binary |-
-    MzgyNGNjMmIxYzRkOTZlM2EwYmQ1YWE3Y2FmMmIyNzZmOTYzOTUxM2MyZjNl
-    MDZiMDlmOWRlYmVhZTIzN2QxN2JjOWVkOTQ3ZGZjYjc2N2JmOTQxMGFjN2E1
-    ZTNkOWRjZmM1ZDNmMDRjODE3Y2I2ZTgyY2RlMjYyMWI4MjZhNjI=
+    ZjQyNWMwYzgxMjU2MmU3MDVkMTcyZWEzMWFlNjM3NGIwYjFiYTY0Mzk0Mzg2
+    Zjk5MzE5MjUxZDQwMzBkYjAzODkyZjkyZTZjZDU1MTcyZGE4YTJjMDdlZmM5
+    ODMyZmUxMGZjZWI0NTQxZGM4NDdlYTJlNmMwZmVmZGViYjM5MjE=

data/README.md

@@ -1,8 +1,8 @@
 ## Rumm: a tasty tool for hackers and pirates
 
 [![Gem Version](https://badge.fury.io/rb/rumm.png)](http://badge.fury.io/rb/rumm)
-[![Build Status](https://travis-ci.org/rackerlabs/rumm.png?branch=master)](https://travis-ci.org/rackerlabs/rumm)
-[![Dependency Status](https://gemnasium.com/rackerlabs/rumm.png)](https://gemnasium.com/rackerlabs/rumm)
+[![Build Status](https://travis-ci.org/rackspace/rumm.png?branch=master)](https://travis-ci.org/rackspace/rumm)
+[![Dependency Status](https://gemnasium.com/rackspace/rumm.png)](https://gemnasium.com/rackspace/rumm)
 
 
 Rumm is a command line interface and API to rackspace. You can use it
@@ -16,7 +16,9 @@ Authenticate with rackspace using your cloud credentials as follows:
     rumm login
       username: joe
       password: ****
-      logged in, credentials written to ~/.netrc
+      Default Region (Enter for ord):
+
+      logged in as joe, credentials written to ~/.rummrc
       
 
 Now we can see the list of servers we have available:
@@ -35,6 +37,12 @@ For further help, including a full listing of commands, type:
 
     rumm help
 
+To access servers outside of your default region, you can prefix your rumm command with REGION=<region name>.
+
+For example to list servers in IAD you would execute the following:
+
+REGION=iad rumm show servers
+
 ## Further Reading
 
 See the [official rumm website][1] for more information, including documentation.

data/app.rb

@@ -1,8 +1,21 @@
 require "mvcli/app"
 require "rumm/version"
+require "rumm/exceptions"
 
 module Rumm
   class App < MVCLI::App
     self.root = Pathname(__FILE__).dirname
+
+    def main(argv = ARGV.dup, input = $stdin, output = $stdout, log = $stderr, env = ENV.dup)
+      super.tap do |code|
+
+        # HACK: print out usage information if we can't the the command
+        if code == MVCLI::Middleware::ExitStatus::EX_USAGE
+          puts "\n"
+          super(%w[help commands], input, output, log, env) rescue code
+        end
+      end
+    end
+
   end
 end

data/app/controllers/authentication_controller.rb

@@ -1,19 +1,21 @@
 require "net/https"
 require "json"
-require "netrc"
 require "excon"
 
 class AuthenticationController < MVCLI::Controller
 
   requires :user
+  requires :configuration
+  requires :login_information
 
   def login
-    login_info = user
+    login_info = login_information
     username = login_info.name
     password = login_info.password
 
-    connection = Excon.new('https://identity.api.rackspacecloud.com')
-
+    uri = URI.parse(configuration.auth_endpoint)
+    connection = Excon.new(uri.to_s)
+    
     headers = {'Content-Type' => 'application/json'}
     body = {auth: {passwordCredentials: {username: username, password: password}}}
 
@@ -30,16 +32,15 @@ class AuthenticationController < MVCLI::Controller
 
     user_credentials = Map(JSON.parse response.body)
 
-    netrc = Netrc.read
-    netrc['api.rackspace.com'] = username, user_credentials["RAX-KSKEY:apiKeyCredentials"].apiKey
-    netrc.save
-
+    configuration.username = username
+    configuration.api_key = user_credentials["RAX-KSKEY:apiKeyCredentials"].apiKey
+    configuration.region = login_info.region
+    configuration.save
+    
     user_info
   end
 
   def logout
-    n = Netrc.read
-    n.delete 'api.rackspace.com'
-    n.save
+    configuration.delete
   end
 end

data/app/controllers/railsifications_controller.rb

@@ -1,5 +1,6 @@
 require "tmpdir"
 require "open3"
+require "bundler"
 
 class RailsificationsController < MVCLI::Controller
   requires :compute
@@ -13,29 +14,31 @@ class RailsificationsController < MVCLI::Controller
     tmpdir = Pathname(Dir.tmpdir).join 'chef_kitchen'
     FileUtils.mkdir_p tmpdir
     Dir.chdir tmpdir do
-      File.open('Gemfile', 'w') do |f|
-        f.puts 'source "https://rubygems.org"'
-        f.puts 'gem "knife-solo", ">= 0.3.0pre3"'
-        f.puts 'gem "berkshelf"'
-      end
-      execute "bundle install --binstubs"
-      execute "bin/knife solo init ."
-      File.open 'Berksfile', 'w' do |f|
-        f.puts "site :opscode"
-        f.puts ""
-        f.puts "cookbook 'runit', '>= 1.1.2'"
-        f.puts "cookbook 'rackbox', github: 'hayesmp/rackbox-cookbook'"
-      end
-      execute "bin/berks install --path cookbooks/"
-      execute "bin/knife solo prepare root@#{server.ipv4_address}"
-      File.open('nodes/host.json', 'w') do |f|
-        f.puts('{"run_list":["rackbox"],"rackbox":{"apps":{"unicorn":[{"appname":"app1","hostname":"app1"}]},"ruby":{"global_version":"2.0.0-p195","versions":["2.0.0-p195"]}}}')
-      end
+      Bundler.with_clean_env do
+        File.open('Gemfile', 'w') do |f|
+          f.puts 'source "https://rubygems.org"'
+          f.puts 'gem "knife-solo", ">= 0.3.0pre3"'
+          f.puts 'gem "berkshelf"'
+        end
+        execute "bundle install --binstubs"
+        execute "bin/knife solo init ."
+        File.open 'Berksfile', 'w' do |f|
+          f.puts "site :opscode"
+          f.puts ""
+          f.puts "cookbook 'runit', '>= 1.1.2'"
+          f.puts "cookbook 'rackbox', github: 'hayesmp/rackbox-cookbook'"
+        end
+        execute "bin/berks install --path cookbooks/"
+        execute "bin/knife solo prepare root@#{server.ipv4_address}"
+        File.open('nodes/host.json', 'w') do |f|
+          f.puts('{"run_list":["rackbox"],"rackbox":{"apps":{"unicorn":[{"appname":"app1","hostname":"app1"}]},"ruby":{"global_version":"2.0.0-p195","versions":["2.0.0-p195"]}}}')
+        end
 
-      FileUtils.rm_rf "#{server.ipv4_address}.json"
-      FileUtils.mv "nodes/host.json", "nodes/#{server.ipv4_address}.json"
+        FileUtils.rm_rf "#{server.ipv4_address}.json"
+        FileUtils.mv "nodes/host.json", "nodes/#{server.ipv4_address}.json"
 
-      execute "bin/knife solo cook root@#{server.ipv4_address}"
+        execute "bin/knife solo cook root@#{server.ipv4_address}"
+      end
     end
     return server
   end

data/app/controllers/servers_controller.rb

@@ -31,6 +31,20 @@ class ServersController < MVCLI::Controller
     return server
   end
 
+  def update
+    template = Servers::UpdateForm
+    argv = MVCLI::Argv.new command.argv
+    form = template.new argv.options
+    form.validate!
+
+    unupdated_server = server
+    unupdated_server.name = form.name unless form.name == nil
+    unupdated_server.ipv4_address = form.ipv4 unless form.ipv4 == nil
+    unupdated_server.ipv6_address = form.ipv6 unless form.ipv6 == nil
+
+    unupdated_server.update
+  end
+
   def destroy
     server.tap do |s|
       s.destroy
@@ -43,10 +57,6 @@ class ServersController < MVCLI::Controller
     index.find {|s| s.name == params[:id]} or fail Fog::Errors::NotFound
   end
 
-  def generate_name
-    'divine-reef'
-  end
-
   def ssh
     test = server
     ip_address = test.ipv4_address

data/app/controllers/users_controller.rb

@@ -1,5 +1,6 @@
 class UsersController < MVCLI::Controller
   requires :instances
+  requires :users
   requires :command
 
   def index
@@ -14,6 +15,20 @@ class UsersController < MVCLI::Controller
     instance.users.create form.value
   end
 
+  def show
+    list = users
+    list.instance = instance
+    list.all.find { |u| u.name == params[:id] } or fail Fog::Errors::NotFound
+  end
+
+  def destroy
+    list = users
+    list.instance = instance
+    user = list.all.find { |u| u.name == params[:id] }
+    user.destroy or fail Fog::Errors::NotFound
+  end
+
+
   private
 
   def instance

data/app/forms/servers/update_form.rb

@@ -0,0 +1,7 @@
+class Servers::UpdateForm < MVCLI::Form
+  requires :naming
+
+  input :name, String, default: nil
+  input :ipv4, String, decode: ->(s) { URI('').hostname = s }
+  input :ipv6, String, decode: ->(s) { URI('').hostname = s }
+end

data/app/forms/volumes/create_form.rb

@@ -5,6 +5,5 @@ class Volumes::CreateForm < MVCLI::Form
   input :type, String, default: "SATA"
   input :size, Integer, default: 100
 
-  validates(:type, "must either be SATA or SSD"){ |type| type == "SATA" or "SSD" }
-  validates(:size, "must be between 100 and 1024"){ |size| (100..1024) === size }
+  validates(:type, "must either be SATA or SSD") { |type| type == "SATA" or "SSD" }
 end

data/app/help/create_container.txt

@@ -3,7 +3,6 @@ Usage:
 
 Options:
     -n, --name STRING                  # Name to give the new container
-    none
 
 Arguments:
     none

data/app/help/create_dbinstance.txt

@@ -2,7 +2,7 @@ Usage:
     rumm create dbinstance [--name STRING]
 
 Options:
-    -n, --name STRING                  # Name to give the new server
+    -n, --name STRING                  # Name to give the new dbinstance
 
 Arguments:
     none

data/app/help/create_server.txt

@@ -1,5 +1,5 @@
 Usage:
-    rumm create server [--name STRING] [--image-id STRING] [--flavor-id STRING] [--ssh-private STRING] [--ssh-publinc STRING]
+    rumm create server [--name STRING] [--image-id STRING] [--flavor-id STRING] [--ssh-private STRING] [--ssh-public STRING]
 
 Options:
     -n, --name STRING                  # Name to give the new server

data/app/help/destroy_node_on_loadbalancer.txt

@@ -5,7 +5,7 @@ Options:
     none
 
 Arguments:
-    ID: STRING                       # ID of the node to show
+    ID: STRING                       # ID of the node to destroy
     LOADBALANCER_ID: STRING          # Name of the loadbalancer that contains the node requested
 
 Description:

data/app/help/railsify_server.txt

@@ -1,5 +1,5 @@
 Usage:
-    rumm railsify server id
+    rumm railsify server ID
 
 Options:
     none

data/app/help/show_attachment_on_server.txt

@@ -1,14 +1,14 @@
 Usage:
-    rumm show attachment on server SERVER_ID
+    rumm show attachment on server SERVER_ID --volume STRING
 
 Options:
-    -v, --volume STRING        # Name of the volume to attach
+    -v, --volume STRING        # Name of the attached volume
 
 Arguments:
-    SERVER_ID: STRING          # The name of the server the volume is to be detached from
+    SERVER_ID: STRING          # The name of the attached server
 
 Description:
-    Detaches the specified volume from the named server.
+    Shows details about the specified attachment.
 
 Examples:
     rumm show attachment on server superordinate-struthioniformes --volume colorful-caterpillar

data/app/help/show_server.txt

@@ -5,7 +5,7 @@ Options:
     none
 
 Arguments:
-    ID: STRING          # Name of the server to play
+    ID: STRING          # Name of the server to show
 
 Description:
     Shows the attributes of the sever with the name specified by ID.

data/app/help/update_server.txt

@@ -0,0 +1,19 @@
+Usage:
+    rumm update server ID  [--name STRING] [--ipv4 IPV4] [--ipv6 IPV6]
+
+
+Arguments:
+    ID: STRING          # Name of the server to update
+
+Options:
+    --name: STRING      # The name you want to change the server to
+    --ipv4: IPV4        # The ip you want to change the server to
+    --ipv6: IPV6        # The ip you want to change the server to
+
+Description:
+    Updates the given server to the new values by updating and changing the
+    name, ipv4, or ipv6. It only updates the values if they're given in the
+    command.
+
+Examples:
+    rumm update server silly-saffron --name sad-saffron

data/app/providers/configuration_provider.rb

@@ -0,0 +1,118 @@
+require 'singleton'
+require 'json'
+require 'rbconfig'
+require 'fog'
+
+  class ConfigurationProvider
+
+    def value
+      self
+    end
+
+    def initialize
+      @config = defaults
+      reload
+    end
+
+    def [](key)
+      @config["environments"]["default"][key.to_s] rescue nil
+    end
+
+    def []=(key, value)
+      @config["environments"]["default"][key.to_s] = value
+    end
+
+    [:username, :api_key, :region].each do |sym|
+       class_eval <<-META
+       def #{sym}
+         self['#{sym}']
+       end
+
+       def #{sym}=(value)
+         self['#{sym}'] = value
+       end
+
+       META
+    end
+
+    def region
+      region_to_str(ENV['REGION'] || self['region'])
+    end
+
+    def lon_region?
+      region == "lon"
+    end
+
+    def auth_endpoint
+      # Note: You can authenticate against any endpoint regardless of the location of your cloud account, however, to locate the proper service endpoints
+      # you must authenticate against the correct cloud endpoint
+      self.lon_region? ? Fog::Rackspace::UK_AUTH_ENDPOINT : Fog::Rackspace::US_AUTH_ENDPOINT
+    end
+
+    def reload
+      return false unless File.exists? default_path
+
+      begin
+        File.open default_path do |f|
+          h = JSON.load f
+          @config.merge! h
+          true
+        end
+      rescue => e
+        fail "Unable to read #{default_path} - #{e.inspect}"
+      end
+    end
+
+    def save
+      begin
+        File.open default_path, 'w' do |f|
+          JSON.dump @config, f
+          true
+        end
+      rescue => e
+        fail "Unable to write #{default_path} - #{e.inspect}"
+      end
+    end
+
+
+    def delete
+      @config = defaults
+      File.delete(default_path) if File.exists? default_path
+      true
+    rescue => e
+      fail "Unable to delete #{default_path} - #{e.inspect}"
+    end
+
+    def default_path
+      if windows? && !cygwin?
+        File.join(ENV['USERPROFILE'].gsub("\\","/"), ".rummrc")
+      else
+        File.join((ENV["HOME"] || "./"), ".rummrc")
+      end
+    end
+
+    private
+
+    def region_to_str(str)
+      str ? str.to_s.downcase : nil
+    end
+
+    def defaults
+      { "environments" => {
+          "default" => {
+            "region" => :ord
+          }
+        }
+      }
+    end
+
+    # see http://stackoverflow.com/questions/4871309/what-is-the-correct-way-to-detect-if-ruby-is-running-on-windows
+    def windows?
+      RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
+    end
+
+    def cygwin?
+      RbConfig::CONFIG["host_os"] =~ /cygwin/
+    end
+
+  end