cyoi 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f40ad034c190187459af10b580876f6fa0d79fed
-  data.tar.gz: 1d7dbe001b4f2178d0637cbe14b0161e67c9032d
+  metadata.gz: 65745e0fecf89e39b10ea1637266b6d2068035e6
+  data.tar.gz: 78bc1bb11f29d4856f806fc98b65ee7a562525bb
 SHA512:
-  metadata.gz: 0970dc12135136b9b493b883536573851af110f58ea9582ca7820ad04f12d8abaec10b27e6923a9fe2091f4de175bb17c54f0fa0e32a8e864d1e0d3d00a721f7
-  data.tar.gz: 53cbe081b9d407fb26b9987a9a0d6a533da3736fb45c43b7668133cf78e2a35368854dfd72d75b39864b605a7a57733829b766c793a249426ab73a62c02d09a3
+  metadata.gz: 0962060185d439a2d23b4fdf04624caeefd54a825635d0b406f343e6a019da5debec03d779babd73a95d266e136e1b036ba5f87a898ecbcdd93a3472ef078851
+  data.tar.gz: ec0c841da483288bc33d2676f3e643e6debd596c39a42f99b43349adaf1cec08938f03d181217e77dd3925b9dc315edcef370c66baa472e46ddab5d2348d722c

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 script: bundle exec rake spec:$SUITE
 rvm:
-  - ruby-1.9.3
   # - rbx-19mode
-  - ruby-2.0.0
+  - ruby-2.1.3
 notifications:
   email:
     recipients:

data/ChangeLog.md

@@ -7,6 +7,7 @@ v0.11
 
 -	AWS VPC support - choose a VPC, choose a subnet, an IP is selected.
 -	AWS - Trusty AMIs if looking for an AMI [v0.11.1]
+-	AWS - New Germany/Frankfurt region [v0.11.2]
 
 v0.10
 -----

data/README.md

@@ -27,10 +27,12 @@ Using provider aws:
 2. US West (Oregon) Region (us-west-2)
 3. US West (Northern California) Region (us-west-1)
 4. EU (Ireland) Region (eu-west-1)
-5. Asia Pacific (Singapore) Region (ap-southeast-1)
-6. Asia Pacific (Sydney) Region (ap-southeast-2)
-7. Asia Pacific (Tokyo) Region (ap-northeast-1)
-8. South America (Sao Paulo) Region (sa-east-1)
+5. EU (Frankfurt) Region (eu-central-1)
+6. Asia Pacific (Singapore) Region (ap-southeast-1)
+7. Asia Pacific (Sydney) Region (ap-southeast-2)
+8. Asia Pacific (Tokyo) Region (ap-northeast-1)
+9. South America (Sao Paulo) Region (sa-east-1)
+10. China (Beijing) Region (cn-north-1)
 Choose AWS region: 2
 
 Access key: KEYGOESHERE
@@ -70,9 +72,9 @@ gem "cyoi"
 Contributing
 ------------
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-6. Send [@drnic](https://github.com/drnic) a big bag of Doritos
+1.	Fork it
+2.	Create your feature branch (`git checkout -b my-new-feature`)
+3.	Commit your changes (`git commit -am 'Add some feature'`)
+4.	Push to the branch (`git push origin my-new-feature`)
+5.	Create new Pull Request
+6.	Send [@drnic](https://github.com/drnic) a big bag of Doritos

data/lib/cyoi/cli/helpers/settings.rb

@@ -27,8 +27,8 @@ module Cyoi::Cli::Helpers::Settings
         mkdir_p(settings_dir)
         File.open(settings_path, "w") { |file| file << "--- {}" }
       end
-      chmod(0600, settings_path)
-      chmod(0700, settings_ssh_dir) if File.directory?(settings_ssh_dir)
+      FileUtils.chmod(0600, settings_path)
+      FileUtils.chmod(0700, settings_ssh_dir) if File.directory?(settings_ssh_dir)
       ReadWriteSettings.new(settings_path)
     end
   end

data/lib/cyoi/cli/provider_image/image_cli_aws.rb

@@ -26,6 +26,8 @@ class Cyoi::Cli::Image::ImageCliAws < Cyoi::Cli::Image::ImageCliBase
       "ami-98aa1cf0"
     when "us-west-1"
       "ami-736e6536"
+    when "eu-central-1"
+        "ami-423c0a5f"
     when "cn-north-1"
       "ami-e642d0df"
     when "ap-southeast-2"

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

@@ -1,3 +1,4 @@
+require "cyoi/providers/constants/aws_constants"
 require "cyoi/cli/providers/provider_cli"
 class Cyoi::Cli::Providers::ProviderCliAws < Cyoi::Cli::Providers::ProviderCli
   def perform_and_return_attributes
@@ -52,17 +53,7 @@ class Cyoi::Cli::Providers::ProviderCliAws < Cyoi::Cli::Providers::ProviderCli
   protected
   # http://docs.aws.amazon.com/general/latest/gr/rande.html#region
   def region_labels
-    [
-      { label: "US East (Northern Virginia) Region", code: "us-east-1" },
-      { label: "US West (Oregon) Region", code: "us-west-2" },
-      { label: "US West (Northern California) Region", code: "us-west-1" },
-      { label: "EU (Ireland) Region", code: "eu-west-1" },
-      { label: "Asia Pacific (Singapore) Region", code: "ap-southeast-1" },
-      { label: "Asia Pacific (Sydney) Region", code: "ap-southeast-2" },
-      { label: "Asia Pacific (Tokyo) Region", code: "ap-northeast-1" },
-      { label: "South America (Sao Paulo) Region", code: "sa-east-1" },
-      { label: "China (Beijing) Region", code: "cn-north-1" },
-    ]
+    Cyoi::Providers::Constants::AwsConstants.region_labels
   end
 
   def default_region_code

data/lib/cyoi/providers/clients/aws_provider_client.rb

@@ -186,6 +186,8 @@ class Cyoi::Providers::Clients::AwsProviderClient < Cyoi::Providers::Clients::Fo
       "ami-98aa1cf0"
     when "us-west-1"
       "ami-736e6536"
+    when "eu-central-1"
+      "ami-423c0a5f"
     when "cn-north-1"
       "ami-e642d0df"
     when "ap-southeast-2"

data/lib/cyoi/providers/constants/aws_constants.rb

@@ -12,10 +12,12 @@ module Cyoi::Providers::Constants::AwsConstants
       { label: "US West (Oregon) Region", code: "us-west-2" },
       { label: "US West (Northern California) Region", code: "us-west-1" },
       { label: "EU (Ireland) Region", code: "eu-west-1" },
+      { label: "EU (Frankfurt) Region", code: "eu-central-1" },
       { label: "Asia Pacific (Singapore) Region", code: "ap-southeast-1" },
       { label: "Asia Pacific (Sydney) Region", code: "ap-southeast-2" },
       { label: "Asia Pacific (Tokyo) Region", code: "ap-northeast-1" },
       { label: "South America (Sao Paulo) Region", code: "sa-east-1" },
+      { label: "China (Beijing) Region", code: "cn-north-1" },
     ]
   end
 

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

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

@@ -87,10 +87,11 @@ Using provider AWS
 2. US West (Oregon) Region (us-west-2)
 3. US West (Northern California) Region (us-west-1)
 4. EU (Ireland) Region (eu-west-1)
-5. Asia Pacific (Singapore) Region (ap-southeast-1)
-6. Asia Pacific (Sydney) Region (ap-southeast-2)
-7. Asia Pacific (Tokyo) Region (ap-northeast-1)
-8. South America (Sao Paulo) Region (sa-east-1)
+5. EU (Frankfurst) Region (eu-central-1)
+6. Asia Pacific (Singapore) Region (ap-southeast-1)
+7. Asia Pacific (Sydney) Region (ap-southeast-2)
+8. Asia Pacific (Tokyo) Region (ap-northeast-1)
+9. South America (Sao Paulo) Region (sa-east-1)
 Choose AWS region:
 Confirming: Using AWS EC2/ap-southeast-2
     OUT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A library to ask an end-user to choose an infrastructure (AWS, OpenStack,