cyoi 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDA0OTA5Y2IyMTc3MWYyZTg4NDcyN2M3NWQwN2M5MzU5MmZhMWRhZg==
+    MmEzZGE0MzhjNDVkOTZjOWIxYWNiOTFmZmYyZDQ3YjI2ZDIyMTA1Ng==
   data.tar.gz: !binary |-
-    MjE4Yjc1OTU4MjcwMDMzMzU4YWE5YTYxMDQ0YTQxODBhZWY5MWI1NQ==
+    YjY0MWMxZTliYzA5YmQ0MWVjNjQ4ZTQ2ZGYzZTM2ZjhiMjBmZjBiYw==
 SHA512:
   metadata.gz: !binary |-
-    YWEyNDY1MTc4YTFjODcyMTgzZmRlNWFiYTBiYmExZGNjYmI0ZTM1OTgyOWY3
-    MzYzZWY3NDk1NDVhMzA3NDBkNTJmMGE0MjM5MTZkN2QzYjMyODI2NjA2NmY1
-    N2E1ZWYyODlmZDQwOWFkNTNmZTIyZjZhYWRiMjVmNmJmNGQzMWE=
+    NjdmZTdlZGIzZjlkZTIyNWUzOGFjNWQ0MzNkYjc4M2NhYjhhMGRiY2VjODQ2
+    NWQ2NjdlYjI4MzE3NDRmZGIxNzhmMGMyMjE2MDZiZDRjMjNlYjcwNTU5MDU1
+    MGIwZTgzY2MxNDRhY2ZjMDA5ZTE3NDk5ZGI1MTU4Y2Y2YTRmZWE=
   data.tar.gz: !binary |-
-    MDczYzBhMTBjY2M2NWZhMzkxZTc1ZTM0OGIyNGY0M2E5YTVhMzBkYmZhMzQ3
-    YmFkNjFhNmZlNzc3M2FmNjk2MmZlZDI3ZmE3ZWM2YjBiYmNiOTMxMjM3Nzcx
-    NDI5MGNlYzc0MzFiZDVhMjYyNGVkZmIxYjM5M2RiMWQyNWEyZmU=
+    MWE0N2Q5MmVjYTE3ZDQ1OTNiY2RlMjNlZjllNGZjNWE3MmQ2NTViOTk5ZTFi
+    ZGQxNWU4YjU0YzlkNzAxNDY1YmQyMDRmZmMyNzEzOTM3MTU1YTNhZjdhNWVi
+    Nzc2ZWNmMTcyNTM0OTA2OGNkNTQ1MTFiODBhN2E2ZGNiZmJhYzQ=

data/ChangeLog.md

@@ -5,6 +5,7 @@ Cyoi (choose-your-own-infrastructure) is a library to ask an end-user to choose
 ## v0.6
 
 * added `cyoi image` - AWS: public AMI for Ubuntu 13.04; OpenStack: choose an Image from menu
+* openstack region doesn't repeatably prompt if set to nothing [v0.6.1]
 
 ## v0.5
 

data/lib/cyoi/cli/auto_detection/auto_detection_fog.rb

@@ -64,15 +64,16 @@ class Cyoi::Cli::AutoDetection::AutoDetectionFog
         }
       end
       if profile[:openstack_username]
-        fog_choices["OpenStack (#{profile_name})"] = {
+        choice = {
           "name" => "openstack",
           "provider" => "OpenStack",
           "openstack_username" => profile[:openstack_username],
           "openstack_api_key" => profile[:openstack_api_key],
           "openstack_tenant" => profile[:openstack_tenant],
           "openstack_auth_url" => profile[:openstack_auth_url],
-          "openstack_region" => profile[:openstack_region]
         }
+        choice["openstack_region"] = profile[:openstack_region] if profile[:openstack_region]
+        fog_choices["OpenStack (#{profile_name})"] = choice
       end
     end
     fog_choices

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

@@ -9,7 +9,6 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
   end
 
   def setup_credentials
-    puts "\n"
     attributes.set_default("credentials", {})
     credentials = attributes.credentials
     credentials["openstack_username"] = hl.ask("Username: ").to_s unless credentials.exists?("openstack_username")
@@ -17,7 +16,10 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
     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")
     credentials["openstack_auth_url"] = credentials["openstack_auth_url"] + "/tokens" unless credentials["openstack_auth_url"].match(/\/tokens$/)
-    credentials["openstack_region"] = hl.ask("OpenStack Region (optional): ").to_s unless credentials.exists?("openstack_region")
+    unless credentials.has_key?("openstack_region")
+      credentials["openstack_region"] = hl.ask("OpenStack Region (optional): ").to_s.strip
+    end
+    attributes["credentials"] = credentials # need to reassign changed value
   end
 
   def valid_infrastructure?
@@ -30,7 +32,12 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
 
   def display_confirmation
     puts "\n"
-    puts "Confirming: Using OpenStack"
+    region = attributes.credentials["openstack_region"]
+    if region.size > 0
+      puts "Confirming: Using OpenStack/#{region} (user: #{attributes.credentials.openstack_username})"
+    else
+      puts "Confirming: Using OpenStack (user: #{attributes.credentials.openstack_username})"
+    end
   end
 end
 

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

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

@@ -12,7 +12,7 @@ describe "cyoi provider openstack" do
     setting "provider.credentials.openstack_auth_url", "TOKENURL"
     setting "provider.credentials.openstack_region", "REGION"
     run_interactive(unescape("cyoi provider #{settings_dir}"))
-    assert_passing_with("Confirming: Using OpenStack")
+    assert_passing_with("Confirming: Using OpenStack/REGION (user: USERNAME)")
   end
 
   it "prompts for everything (no region)" do
@@ -29,9 +29,8 @@ describe "cyoi provider openstack" do
 2. OpenStack
 Choose your infrastructure: 
 Using provider OpenStack
-
 Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional): 
-Confirming: Using OpenStack
+Confirming: Using OpenStack (user: USERNAME)
     OUT
 
     reload_settings!
@@ -61,9 +60,8 @@ Confirming: Using OpenStack
 2. OpenStack
 Choose your infrastructure: 
 Using provider OpenStack
-
 Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional): 
-Confirming: Using OpenStack
+Confirming: Using OpenStack/REGION (user: USERNAME)
     OUT
   end
 
@@ -72,7 +70,7 @@ Confirming: Using OpenStack
     setup_fog_with_various_accounts_setup
     run_interactive(unescape("cyoi provider #{settings_dir}"))
     type("4")
-    type("REGION")
+    type("")
     type("")
     assert_passing_with(<<-OUT)
 Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
@@ -83,9 +81,8 @@ Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
 5. Alternate credentials
 Choose an auto-detected infrastructure:  
 Using provider OpenStack
-
 OpenStack Region (optional): 
-Confirming: Using OpenStack
+Confirming: Using OpenStack (user: USERNAME)
     OUT
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog