cyoi 0.5.1 → 0.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDA0OTA5Y2IyMTc3MWYyZTg4NDcyN2M3NWQwN2M5MzU5MmZhMWRhZg==
+  data.tar.gz: !binary |-
+    MjE4Yjc1OTU4MjcwMDMzMzU4YWE5YTYxMDQ0YTQxODBhZWY5MWI1NQ==
+SHA512:
+  metadata.gz: !binary |-
+    YWEyNDY1MTc4YTFjODcyMTgzZmRlNWFiYTBiYmExZGNjYmI0ZTM1OTgyOWY3
+    MzYzZWY3NDk1NDVhMzA3NDBkNTJmMGE0MjM5MTZkN2QzYjMyODI2NjA2NmY1
+    N2E1ZWYyODlmZDQwOWFkNTNmZTIyZjZhYWRiMjVmNmJmNGQzMWE=
+  data.tar.gz: !binary |-
+    MDczYzBhMTBjY2M2NWZhMzkxZTc1ZTM0OGIyNGY0M2E5YTVhMzBkYmZhMzQ3
+    YmFkNjFhNmZlNzc3M2FmNjk2MmZlZDI3ZmE3ZWM2YjBiYmNiOTMxMjM3Nzcx
+    NDI5MGNlYzc0MzFiZDVhMjYyNGVkZmIxYjM5M2RiMWQyNWEyZmU=

data/.travis.yml

@@ -13,5 +13,6 @@ notifications:
 env:
   matrix:
     - SUITE=unit
+    - SUITE=integration
   global:
     - secure: ""

data/ChangeLog.md

@@ -2,6 +2,10 @@
 
 Cyoi (choose-your-own-infrastructure) is a library to ask an end-user to choose an infrastructure (AWS, OpenStack, etc), region, and login credentials.
 
+## v0.6
+
+* added `cyoi image` - AWS: public AMI for Ubuntu 13.04; OpenStack: choose an Image from menu
+
 ## v0.5
 
 * OpenStack implementation completed by Ferdy!

data/bin/cyoi

@@ -14,6 +14,9 @@ when :provider
 when :address
   require "cyoi/cli/address"
   Cyoi::Cli::Address.new(argv)
+when :image
+  require "cyoi/cli/image"
+  Cyoi::Cli::Image.new(argv)
 when :keypair, :key_pair
   require "cyoi/cli/key_pair"
   Cyoi::Cli::KeyPair.new(argv)

data/lib/cyoi/cli/image.rb

@@ -0,0 +1,61 @@
+require "cyoi/cli"
+require "cyoi/cli/auto_detection"
+require "cyoi/cli/helpers"
+class Cyoi::Cli::Image
+  include Cyoi::Cli::Helpers
+
+  def initialize(argv, stdin=STDIN, stdout=STDOUT, stderr=STDERR, kernel=Kernel)
+    @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+    @settings_dir = @argv.shift || "/tmp/provider_settings"
+    @settings_dir = File.expand_path(@settings_dir)
+  end
+
+  # TODO run Cyoi::Cli::Provider first if settings.provider.name missing
+  def execute!
+    unless settings.exists?("provider.name")
+      $stderr.puts("Please run 'cyoi provider' first")
+      exit 1
+    end
+    unless valid?
+      settings["image"] = perform_and_return_attributes
+      save_settings!
+    end
+    image_cli.display_confirmation
+  end
+
+  # Continue the interactive session with the user
+  # specific to the infrastructure they have chosen.
+  #
+  # The returned object is a class from cyoi/cli/provider_image/provier_cli_INFRASTRUCTURE.rb
+  # The class loads itself into `@image_clis` via `register_image_cli`
+  #
+  # Returns nil if settings.key_pair.name not set
+  def image_cli
+    @image_cli ||= begin
+      provider_name = settings.exists?("provider.name")
+      return nil unless provider_name
+      require "cyoi/cli/provider_image/image_cli_#{settings.provider.name}"
+      settings["image"] ||= {}
+      klass = self.class.image_cli(settings.provider.name)
+      klass.new(provider_client, settings.image, hl)
+    end
+  end
+
+  def perform_and_return_attributes
+    image_cli.perform_and_return_attributes
+  end
+
+  def self.register_image_cli(name, klass)
+    @image_clis ||= {}
+    @image_clis[name] = klass
+  end
+
+  def self.image_cli(name)
+    @image_clis[name]
+  end
+
+  protected
+  def valid?
+    settings["image"] && settings["image"]["image_id"]
+  end
+end

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

@@ -0,0 +1,34 @@
+require "cyoi/cli/provider_image/image_cli_base"
+class Cyoi::Cli::Image::ImageCliAws < Cyoi::Cli::Image::ImageCliBase
+
+  def image_id
+    ubuntu_1304_image_id
+  end
+
+  # Ubuntu 13.04
+  def ubuntu_1304_image_id
+    region = provider_client.attributes.region
+    # http://cloud-images.ubuntu.com/locator/ec2/
+    image_id = case region.to_s
+    when "ap-northeast-1"
+      "ami-6b26ab6a"
+    when "ap-southeast-1"
+      "ami-2b511e79"
+    when "eu-west-1"
+      "ami-3d160149"
+    when "sa-east-1"
+      "ami-28e43e35"
+    when "us-east-1"
+      "ami-c30360aa"
+    when "us-west-1"
+      "ami-d383af96"
+    when "ap-southeast-2"
+      "ami-84a333be"
+    when "us-west-2"
+      "ami-bf1d8a8f"
+    end
+    image_id || raise("Please add Ubuntu 13.04 64bit (EBS) AMI image id to aws.rb#raring_image_id method for region '#{region}'")
+  end
+end
+
+Cyoi::Cli::Image.register_image_cli("aws", Cyoi::Cli::Image::ImageCliAws)

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

@@ -0,0 +1,34 @@
+class Cyoi::Cli::Image; end
+class Cyoi::Cli::Image::ImageCliBase
+  attr_reader :provider_client
+  attr_reader :attributes
+  attr_reader :hl
+
+  def initialize(provider_client, attributes, highline)
+    @provider_client = provider_client
+    @hl = highline
+    @attributes = attributes.is_a?(Hash) ? ReadWriteSettings.new(attributes) : attributes
+    raise "@attributes must be ReadWriteSettings (or Hash); was #{@attributes.class}" unless @attributes.is_a?(ReadWriteSettings)
+  end
+
+  def perform_and_return_attributes
+    unless valid?
+      attributes["image_id"] = image_id
+    end
+    export_attributes
+  end
+
+  # helper to export the complete nested attributes.
+  def export_attributes
+    attributes.to_nested_hash
+  end
+
+  def valid?
+    attributes["image_id"]
+  end
+
+  def display_confirmation
+    puts "\n"
+    puts "Confirming: Using image #{attributes["image_id"]}"
+  end
+end

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

@@ -0,0 +1,23 @@
+require "cyoi/cli/provider_image/image_cli_base"
+class Cyoi::Cli::Image::ImageCliOpenStack < Cyoi::Cli::Image::ImageCliBase
+
+  def image_id
+    choose_image_id
+  end
+
+  def choose_image_id
+    hl.choose do |menu|
+      menu.prompt = "Choose image: "
+      images.each do |image|
+        label, code = image[:label], image[:code]
+        menu.choice(label) { return code }
+      end
+    end
+  end
+
+  def images
+    provider_client.fog_compute.images.map { |image| { label: image.name, code: image.id }}
+  end
+end
+
+Cyoi::Cli::Image.register_image_cli("openstack", Cyoi::Cli::Image::ImageCliOpenStack)

data/lib/cyoi/version.rb

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

data/spec/integration/cli/image/image_aws_spec.rb

@@ -0,0 +1,15 @@
+describe "cyoi image aws" do
+  include Cyoi::Cli::Helpers::Settings
+  include SettingsHelper
+  include Aruba::Api
+  before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
+
+  it "provider choices already made" do
+    setting "provider.name", "aws"
+    setting "provider.credentials.aws_access_key_id", "aws_access_key_id"
+    setting "provider.credentials.aws_secret_access_key", "aws_secret_access_key"
+    setting "provider.region", "us-west-2"
+    run_interactive(unescape("cyoi image #{settings_dir}"))
+    assert_passing_with("Confirming: Using image ami-bf1d8a8f")
+  end
+end

data/spec/integration/cli/image/image_openstack_spec.rb

@@ -0,0 +1,28 @@
+describe "cyoi image openstack" do
+  include Cyoi::Cli::Helpers::Settings
+  include SettingsHelper
+  include Aruba::Api
+  before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
+
+  it "provider choices already made" do
+    setting "provider.name", "openstack"
+    setting "provider.credentials.openstack_username", "username"
+    setting "provider.credentials.openstack_api_key", "password"
+    setting "provider.credentials.openstack_tenant", "tenant"
+    setting "provider.credentials.openstack_auth_url", "http://1.2.3.4:5000/v2.0/tokens"
+    setting "provider.credentials.openstack_region", ""
+
+    run_interactive(unescape("cyoi image #{settings_dir}"))
+    type("1")
+    assert_passing_with(<<-OUT)
+1. cirros-0.3.0-x86_64-blank
+Choose image: 
+Confirming: Using image 0e09fbd6-43c5-448a-83e9-0d3d05f9747e
+    OUT
+
+    reload_settings!
+    settings.image.to_nested_hash.should == {
+      "image_id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e"
+    }
+  end
+end

data/spec/unit/cli/image_spec.rb

@@ -0,0 +1,66 @@
+require "fog"
+require "cyoi/cli/image"
+
+describe "cyoi" do
+  include Cyoi::Cli::Helpers::Settings
+  include SettingsHelper
+  include StdoutCapture
+  include Aruba::Api
+  before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
+  before { Fog.mock!; Fog::Mock.reset }
+
+  describe "cyoi image aws" do
+    before do
+      setting "provider.name", "aws"
+      setting "provider.credentials.aws_access_key_id", "aws_access_key_id"
+      setting "provider.credentials.aws_secret_access_key", "aws_secret_access_key"
+      setting "provider.region", "us-west-2"
+    end
+
+    subject { Cyoi::Cli::Image.new([settings_dir]) }
+
+    let(:fog_compute) { subject.key_pair_cli.provider_client.fog_compute }
+
+    it "does nothing if image_id already set" do
+      setting "image.image_id", "ami-123456"
+      capture_stdout { subject.execute! }
+      reload_settings!
+      settings.image.image_id.should == "ami-123456"
+    end
+
+    it "auto-selects Ubuntu 13.04 image in region" do
+      capture_stdout { subject.execute! }
+      reload_settings!
+      settings.image.image_id.should == "ami-bf1d8a8f"
+    end
+  end
+
+  describe "cyoi image openstack" do
+    before do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_username", "username"
+      setting "provider.credentials.openstack_api_key", "password"
+      setting "provider.credentials.openstack_tenant", "tenant"
+      setting "provider.credentials.openstack_auth_url", "http://1.2.3.4:5000/v2.0/tokens"
+      setting "provider.credentials.openstack_region", ""
+    end
+
+    subject { Cyoi::Cli::Image.new([settings_dir]) }
+
+    let(:fog_compute) { subject.key_pair_cli.provider_client.fog_compute }
+
+    it "does nothing if image_id already set" do
+      setting "image.image_id", "b2d1fa83-67aa-4b6d-b171-5ea466d6d8ab"
+      capture_stdout { subject.execute! }
+      reload_settings!
+      settings.image.image_id.should == "b2d1fa83-67aa-4b6d-b171-5ea466d6d8ab"
+    end
+
+    it "prompts for image in menu" do
+      subject.should_receive(:perform_and_return_attributes).and_return({"image_id" => "chosen-image-id"})
+      capture_stdout { subject.execute! }
+      reload_settings!
+      settings.image.image_id.should == "chosen-image-id"
+    end
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: readwritesettings
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -152,10 +137,14 @@ files:
 - lib/cyoi/cli/helpers/interactions.rb
 - lib/cyoi/cli/helpers/provider.rb
 - lib/cyoi/cli/helpers/settings.rb
+- lib/cyoi/cli/image.rb
 - lib/cyoi/cli/key_pair.rb
 - lib/cyoi/cli/provider.rb
 - lib/cyoi/cli/provider_addresses/address_cli_aws.rb
 - lib/cyoi/cli/provider_addresses/address_cli_openstack.rb
+- lib/cyoi/cli/provider_image/image_cli_aws.rb
+- lib/cyoi/cli/provider_image/image_cli_base.rb
+- lib/cyoi/cli/provider_image/image_cli_openstack.rb
 - lib/cyoi/cli/provider_key_pair/key_pair_aws.rb
 - lib/cyoi/cli/provider_key_pair/key_pair_openstack.rb
 - lib/cyoi/cli/providers/provider_cli.rb
@@ -172,6 +161,8 @@ files:
 - spec/.DS_Store
 - spec/integration/cli/address/address_aws_spec.rb
 - spec/integration/cli/address/address_openstack_spec.rb
+- spec/integration/cli/image/image_aws_spec.rb
+- spec/integration/cli/image/image_openstack_spec.rb
 - spec/integration/cli/key_pair/key_pair_aws_spec.rb
 - spec/integration/cli/key_pair/key_pair_openstack_spec.rb
 - spec/integration/cli/provider/provider_aws_spec.rb
@@ -180,37 +171,31 @@ files:
 - spec/support/settings_helper.rb
 - spec/support/stdout_capture.rb
 - spec/unit/.gitkeep
+- spec/unit/cli/image_spec.rb
 - spec/unit/cli/key_pair_spec.rb
 homepage: https://github.com/drnic/cyoi
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3082000765500697274
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3082000765500697274
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library to ask an end-user to choose an infrastructure (AWS, OpenStack,
   etc), region, and login credentials.  This library was extracted from [inception-server](https://github.com/drnic/inception-server)
   for reuse by [bosh-bootstrap](https://github.com/StarkAndWayne/bosh-bootstrap).
@@ -221,6 +206,8 @@ test_files:
 - spec/.DS_Store
 - spec/integration/cli/address/address_aws_spec.rb
 - spec/integration/cli/address/address_openstack_spec.rb
+- spec/integration/cli/image/image_aws_spec.rb
+- spec/integration/cli/image/image_openstack_spec.rb
 - spec/integration/cli/key_pair/key_pair_aws_spec.rb
 - spec/integration/cli/key_pair/key_pair_openstack_spec.rb
 - spec/integration/cli/provider/provider_aws_spec.rb
@@ -229,4 +216,5 @@ test_files:
 - spec/support/settings_helper.rb
 - spec/support/stdout_capture.rb
 - spec/unit/.gitkeep
+- spec/unit/cli/image_spec.rb
 - spec/unit/cli/key_pair_spec.rb