cyoi 0.4.0 → 0.4.1

data/ChangeLog.md

@@ -5,6 +5,7 @@ Cyoi (choose-your-own-infrastructure) is a library to ask an end-user to choose
 ## v0.4
 
 * switch to using readwritesettings instead of fork of settingslogic
+* clean all highline values before setting (v0.4.1)
 
 ## v0.3
 

data/lib/cyoi/cli/providers/provider_cli_aws.rb

@@ -13,8 +13,8 @@ class Cyoi::Cli::Providers::ProviderCliAws < Cyoi::Cli::Providers::ProviderCli
     puts "\n"
     attributes.set_default("credentials", {})
     credentials = attributes.credentials
-    credentials["aws_access_key_id"] = hl.ask("Access key: ") unless credentials.exists?("aws_access_key_id")
-    credentials["aws_secret_access_key"] = hl.ask("Secret key: ") unless credentials.exists?("aws_secret_access_key")
+    credentials["aws_access_key_id"] = hl.ask("Access key: ").to_s unless credentials.exists?("aws_access_key_id")
+    credentials["aws_secret_access_key"] = hl.ask("Secret key: ").to_s unless credentials.exists?("aws_secret_access_key")
   end
 
   def choose_region
@@ -30,7 +30,7 @@ class Cyoi::Cli::Providers::ProviderCliAws < Cyoi::Cli::Providers::ProviderCli
           default_menu_item = menu_item 
         end
         menu.choice(menu_item) do
-          attributes["region"] = code
+          attributes["region"] = code.to_s
         end
       end
       menu.default = default_menu_item if default_menu_item

data/lib/cyoi/cli/providers/provider_cli_openstack.rb

@@ -13,10 +13,10 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
     puts "\n"
     attributes.set_default("credentials", {})
     credentials = attributes.credentials
-    credentials["openstack_username"] = hl.ask("Username: ") unless credentials.exists?("openstack_username")
-    credentials["openstack_api_key"] = hl.ask("Password: ") unless credentials.exists?("openstack_api_key")
-    credentials["openstack_tenant"] = hl.ask("Tenant: ") unless credentials.exists?("openstack_tenant")
-    credentials["openstack_auth_url"] = hl.ask("Authorization Token URL: ") unless credentials.exists?("openstack_auth_url")
+    credentials["openstack_username"] = hl.ask("Username: ").to_s unless credentials.exists?("openstack_username")
+    credentials["openstack_api_key"] = hl.ask("Password: ").to_s unless credentials.exists?("openstack_api_key")
+    credentials["openstack_tenant"] = hl.ask("Tenant: ").to_s unless credentials.exists?("openstack_tenant")
+    credentials["openstack_auth_url"] = hl.ask("Authorization Token URL: ").to_s unless credentials.exists?("openstack_auth_url")
   end
 
   def choose_region

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/integration/cli/provider/provider_aws_spec.rb

@@ -38,6 +38,15 @@ Access key: Secret key:
 Choose AWS region: 
 Confirming: Using AWS/us-west-2
     OUT
+
+    reload_settings!
+    settings.to_nested_hash.should == {
+      "provider" => {
+        "name" => "aws",
+        "credentials"=>{"aws_access_key_id"=>"ACCESS", "aws_secret_access_key"=>"SECRET"},
+        "region" => "us-west-2",
+      }
+    }
   end
 
   it "auto-detects aws options in ~/.fog" do

data/spec/integration/cli/provider/provider_openstack_spec.rb

@@ -34,6 +34,18 @@ Username: Password: Tenant: Authorization Token URL:
 OpenStack Region (optional): 
 Confirming: Using OpenStack
     OUT
+
+    reload_settings!
+    settings.to_nested_hash.should == {
+      "provider" => {
+        "name" => "openstack",
+        "credentials"=>{
+          "openstack_username"=>"USERNAME", "openstack_api_key"=>"PASSWORD", 
+          "openstack_tenant"=>"TENANT", "openstack_auth_url"=>"TOKENURL"
+        },
+        "region" => "",
+      }
+    }
   end
 
   it "prompts for everything (with region)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3776246876278909178
+      hash: -1003985109832984183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3776246876278909178
+      hash: -1003985109832984183
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25