rumm 0.0.23 → 0.0.24

data/app/providers/credentials_provider.rb

@@ -1,10 +1,10 @@
-require 'netrc'
-
 class CredentialsProvider
+  
+  requires :configuration
 
   def value
-    if creds = Netrc.read['api.rackspace.com']
-      Map(username: creds.first, api_key: creds.last, rackspace_region: :ord)
+    if configuration.username
+      Map(username: configuration.username, api_key: configuration.api_key, rackspace_region: configuration.region)
     else
       fail Rumm::LoginRequired, "login required"
     end

data/app/providers/login_information_provider.rb

@@ -0,0 +1,34 @@
+require 'io/console'
+
+class LoginInformationProvider
+  requires :command
+  requires :configuration
+
+  def value
+    name = get_name
+    password = get_password
+    region = get_default_region
+    Map name: name, password: password, region: region
+  end
+
+  private
+
+  def get_name
+    command.output.print "Username: "
+    command.input.gets.chomp
+  end
+
+  def get_password
+    command.output.print "Password: "
+    password = command.input.noecho(&:gets).chomp
+    command.output.print "\n"
+    password
+  end
+
+  def get_default_region
+    command.output.print "Default Region (Enter for #{configuration.region}): "
+    region = command.input.gets.chomp
+    region.empty? ? configuration.region : region
+  end
+
+end

data/app/providers/users_provider.rb

@@ -0,0 +1,13 @@
+require 'fog'
+class UsersProvider
+  requires :credentials
+
+  def value
+    options = {
+      :rackspace_username => credentials.username,
+      :rackspace_api_key  => credentials.api_key,
+      :rackspace_region   => credentials.rackspace_region
+    }
+    Fog::Rackspace::Databases.new(options).users
+  end
+end

data/app/routes.rb

@@ -44,6 +44,7 @@ match 'destroy database :id on dbinstance :instance_id' => 'databases#destroy'
 match 'show users on dbinstance :dbinstance_id' => 'users#index'
 match 'show user :id on dbinstance :dbinstance_id' => 'users#show'
 match 'create user on dbinstance :dbinstance_id' => 'users#create'
+match 'destroy user :id on dbinstance :dbinstance_id' => 'users#destroy'
 
 match 'ssh :id' => 'servers#ssh'
 

data/app/views/authentication/login.txt.erb

@@ -1,2 +1,2 @@
 
-logged in as <%= this.access.user.name %>, credentials written to ~/.netrc
+logged in as <%= this.access.user.name %>, credentials written to ~/.rummrc

data/app/views/help/show.txt.erb

@@ -6,7 +6,7 @@ Rumm: A tasty tool for hackers and pirates
     rumm login
     Username: rsteveson
     Password: ******
-    logged in as rstevenson, credentials written to ~/.netrc
+    logged in as rstevenson, credentials written to ~/.rummrc
 
   And you're good to go! For a list of all commands, run:
 

data/app/views/servers/update.txt.erb

@@ -0,0 +1 @@
+Sent update request to server.

data/app/views/users/create.txt.erb

@@ -1 +1 @@
-created user <%= this.name %> 
+Created user <%= this.name %> 

data/app/views/users/destroy.txt.erb

@@ -0,0 +1 @@
+Requested destruction of user

data/app/views/users/show.txt.erb

@@ -0,0 +1 @@
+<%= this.name %>, databases: <% this.databases.each do |database| %> <%= database["name"] %> <% end %>

data/lib/rumm/exceptions.rb

@@ -0,0 +1,5 @@
+module Rumm
+
+  class LoginRequired < Exception
+  end
+end

data/lib/rumm/version.rb

@@ -1,3 +1,3 @@
 module Rumm
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/rumm.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 1.9.3"
 
   spec.add_dependency "mvcli", "~> 0.0.16"
-  spec.add_dependency "fog", "~> 1.15.0"
-  spec.add_dependency "netrc"
+  spec.add_dependency "fog", "~> 1.16.0"
 end

data/spec/features/attachments_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "using the attachments api" do
   context "with credentials are present" do
 
-    include_context "netrc"
+    include_context "rummrc"
 
     context "to create" do
       When { VCR.use_cassette('attachments/create') { run "rumm create attachment on server silly-saffron --volume jumping-jellybean" }}

data/spec/features/configuration_spec.rb

@@ -0,0 +1,143 @@
+require "spec_helper"
+require "configuration_provider"
+
+describe "configuration" do
+
+  describe "defaults" do
+    context "should be initialized with defaults" do
+      include_context "set fake home"
+      Given(:configuration) { ConfigurationProvider.new.value }
+      Then { configuration.region.should == 'ord' }
+      And { configuration.username.should == nil }
+      And { configuration.api_key.should == nil}
+    end
+  end
+
+  describe "Configuration file present" do
+    include_context "set home"
+    When do
+      File.open("#{home}/.rummrc", 'w') do |f|
+        f.puts "{\"environments\":{\"default\":{\"region\":\"dfw\",\"username\":\"racker\",\"api_key\":\"1234\"}}}"
+      end
+      configuration.reload
+    end
+    Given(:configuration) { ConfigurationProvider.new.value }
+    context "should be initialized with .rummrc file if present" do
+      Then { configuration.region.should == "dfw" }
+      And { configuration.username.should == 'racker' }
+      And { configuration.api_key.should == '1234' }
+    end
+
+    # Cleanup
+    # File.delete "#{@rumm_dir}/.rummrc" if File.exists? "#{@rumm_dir}/.rummrc"
+    describe "region" do
+      When { ENV['REGION'] = "SYD" }
+      context "should be overridable with REGION environment var" do
+        Then { configuration.region.should == "syd" }
+      end
+    end
+
+    #Clean up
+
+    describe "lon_region?" do
+      When { ENV['REGION'] = nil }
+      Given(:configuration) { ConfigurationProvider.new.value }
+      When { configuration.region = region }
+
+      context "when set with lon" do
+        Given (:region) { "lon" }
+        Then { configuration.lon_region? }
+      end
+
+      context "when set with LON" do
+        Given (:region) { "LON" }
+        Then { configuration.lon_region? }
+      end
+
+      context "when set with :lon" do
+        Given (:region) { :lon }
+        Then { configuration.lon_region? }
+      end
+
+      context "when set as nil" do
+        Given (:region) { "nil" }
+        Then { !configuration.lon_region? }
+      end
+
+      context "when set as dfw" do
+        Given (:region) { "nil" }
+        Then { !configuration.lon_region? }
+      end
+    end
+
+    describe "auth_endpoint" do
+      Given (:configuration) { ConfigurationProvider.new.value }
+      When { configuration.region = region }
+
+      context "when set as :lon" do
+        Given (:region) { :lon }
+        Then { configuration.auth_endpoint.should == Fog::Rackspace::UK_AUTH_ENDPOINT }
+      end
+
+      context "when set as :syd" do
+        Given (:region) { :syd }
+        Then { configuration.auth_endpoint.should == Fog::Rackspace::US_AUTH_ENDPOINT }
+      end
+    end
+
+    describe "reload" do
+      context "should reload configuration if config file is present" do
+        Given(:configuration) do
+          ConfigurationProvider.new.value
+        end
+        Given { ENV['REGION'] = nil }
+
+        When do
+          configuration.username = "unclebob"
+          configuration.reload.should be_true
+        end
+        Then { configuration.username.should == "racker" }
+      end
+    end
+    describe "delete" do
+      context "should delete file if it exists and revert to default configuration" do
+        Given(:configuration) { ConfigurationProvider.new.value }
+        Given { File.should_receive(:delete).with "#{File.expand_path(current_dir)}/.rummrc" }
+        When { configuration.delete }
+        Then { configuration.region.should == 'ord' }
+        And { configuration.username.should == nil }
+        And { configuration.api_key.should == nil }
+      end
+      context "should not delete file if it does not exist" do
+        Given(:configuration) { ConfigurationProvider.new.value }
+        Given { File.stub(:exists?).with("#{File.expand_path(current_dir)}/.rummrc").and_return(false)}
+        Given { File.stub(:delete).never }
+        When { configuration.delete.should be_true }
+        Then { configuration.region.should == 'ord' }
+        And { configuration.username.should == nil }
+        And { configuration.api_key.should == nil }
+      end
+    end
+    describe "save" do
+      context "should save the configuration" do
+        Given(:configuration) { ConfigurationProvider.new.value }
+        Given { JSON.stub :dump }
+        Then { configuration.save.should be_true }
+      end
+    end
+  end
+
+  context "should not reload values if configuration file does not exist" do
+    include_context "set fake home"
+
+    Given(:configuration) do
+      ConfigurationProvider.new.value
+    end
+    When do
+      configuration.username = "unclebob"
+      configuration.reload.should be_false
+    end
+
+    Then { configuration.username.should == "unclebob" }
+  end
+end

data/spec/features/containers_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "using the containers api" do
 
-  include_context "netrc"
+  include_context "rummrc"
 
   context "to create" do
     When { VCR.use_cassette('containers/create') { run "rumm create container --name cruising-crouton" }}

data/spec/features/databases_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "using the databases api" do
-  include_context "netrc"
+  include_context "rummrc"
 
   context "to create" do
     When { VCR.use_cassette('databases/create') { run "rumm create database on dbinstance decided-irony --name dancing-bear" }}

data/spec/features/dbinstances_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "using the instance api" do
 
-  include_context "netrc"
+  include_context "rummrc"
 
   context "to create" do
     When { VCR.use_cassette('instances/create') { run "rumm create dbinstance --name dancing-idol" }}

data/spec/features/files_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "using the files api" do
 
-  include_context "netrc"
+  include_context "rummrc"
 
   context "to create" do
     Given do

data/spec/features/help_spec.rb

@@ -14,7 +14,7 @@ describe "interactive learning" do
     #     rumm login
     #     Username: rsteveson
     #     Password: ******
-    #     logged in as rstevenson, credentials written to ~/.netrc
+    #     logged in as rstevenson, credentials written to ~/.rummrc
     #
     #   And you're good to go! The following commands are available in your Rumm
     #   environment:

data/spec/features/loadbalancers_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "using the load balancers api" do
 
-  include_context "netrc"
+  include_context "rummrc"
 
   context "to create" do
     When { VCR.use_cassette('loadbalancers/create') { run "rumm create loadbalancer --name likable-bear --node 166.78.114.25:80" }}

data/spec/features/login_spec.rb

@@ -1,14 +1,16 @@
 require "spec_helper"
-require "netrc"
 require 'io/console'
 
 describe "logging in" do
-  include_context "netrc"
   before do
     run "rumm logout"
   end
-  context "interactively with valid credentials" do
+
+  context "with valid credentials" do
+    Given(:region) { "ord"}
+
     When do
+      run "rumm logout"
       VCR.use_cassette('authentication/successful-login') do
         if VCR.current_cassette.recording?
           print "\nUsername: "
@@ -16,46 +18,58 @@ describe "logging in" do
           print "Password: "
           password = $stdin.noecho(&:gets).chomp
         end
-        will_type username || "<username>"
-        will_type password || "<password>"
+        @username = username || "<username>"
+        will_type(@username)
+        will_type(password || "<password>")
+        will_type region
         run_interactive "rumm login"
         stop_process @interactive
       end
     end
-    Then {last_exit_status == 0}
 
-    context "places your login credentials in your .netrc" do
-      Given(:netrc) { Netrc.read["api.rackspace.com"] }
-      Given(:user) {netrc.first}
-      Given(:password) {netrc.last}
+    Then { last_exit_status == 0 }
 
-      Then { user != nil }
-      And { password != nil }
-    end
-  end
+    Given(:config_file_path) {
+      File.expand_path("~/.rummrc")
+    }
 
-  context "logging out" do
-    When {run "rumm logout"}
-    Then {last_exit_status == 0}
+    Then { File.exists?(config_file_path) }
 
-    context "removes your login credentials from .netrc" do
-      Then do
-        n = Netrc.read
-        user, pass = n["api.rackspace.com"]
-        user == nil and pass == nil
+    Given(:json) {
+      File.open(config_file_path) do |f|
+        JSON.load(f)["environments"]["default"]
       end
-    end
-    context "interactively with invalid credentials" do
-      When do
-        VCR.use_cassette("authentication/unsuccessful-login") do
-          will_type "nil"
-          will_type "nil"
-          run_interactive "rum login"
-          stop_process @interactive
-        end
+    }
+
+    Then { @username == json["username"] }
+    Then { json["api_key"] }
+    Then { region == json["region"] }
+  end
+
+  context "with invalid credentials" do
+    When do
+      VCR.use_cassette('authentication/unsuccessful-login') do
+        will_type "nil"
+        will_type "nil"
+        will_type "nil"
+        run_interactive "rumm login"
+        stop_process @interactive
       end
-      Then {last_exit_status != 0}
-      And {all_stderr =~ /User could not be authenticated/}
     end
+    Then {last_exit_status != 0}
+    And {all_stderr =~ /User could not be authenticated/}
+  end
+
+  context "after previous successful login"
+
+end
+
+
+describe "logging out" do
+
+  When { run "rumm logout" }
+  Then { last_exit_status == 0 }
+  context "deletes .rummrc" do
+    Then { !File.exists? "#{File.expand_path('~')}/.rummrc" }
   end
 end

data/spec/features/nodes_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "using the nodes api" do
   $id = "test"
-  include_context "netrc"
+  include_context "rummrc"
 
   context "to create" do
     When { VCR.use_cassette('nodes/create') { run "rumm create node on loadbalancer laughing-barrel --address 198.61.221.220 --condition ENABLED --port: 80" }}