cyoi 0.1.0 → 0.2.0

data/ChangeLog.md

@@ -0,0 +1,14 @@
+# Change Log
+
+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.2
+
+* executable `cyoi` became `cyoi provider`
+* added `cyoi address` to prompt or provision an IP address (AWS only at moment)
+
+## v0.1
+
+Initial release
+
+* executable `cyoi [settings.yml]` - asks for provider information and stores in settings.yml (AWS & OpenStack)

data/Guardfile

@@ -1,6 +1,6 @@
 guard 'rspec' do
   watch(%r{^spec})
-  watch(%r{^lib/cyoi})    { |m| "spec" }
-  # watch(%r{^lib/cyoi/(.+)\.rb$})    { |m| "spec/unit/#{m[1]}_spec.rb" }
+  # watch(%r{^lib/cyoi})    { |m| "spec" }
+  watch(%r{^lib/cyoi/cli/(?:|provider_)address})    { |m| "spec/integration/cli/address" }
 end
 

data/README.md

@@ -41,7 +41,14 @@ Confirming: Using aws/us-west-2
 
 ## Usage
 
-```
+``` ruby
+provider_cli = Cyoi::Cli::Provider.new([settings_dir])
+provider_cli.execute!
+settings = YAML.load_file(File.join(settings_dir, "settings.yml"))
+
+settings["provider"]["name"] # aws, openstack
+settings["provider"]["region"] # us-east-1
+settings["provider"]["credentials"] # aws or openstack URLs & credentials
 ```
 
 ## Installation

data/Rakefile

@@ -17,10 +17,16 @@ if defined?(RSpec)
       t.pattern = "spec/unit/**/*_spec.rb"
       t.rspec_opts = %w(--format progress --color)
     end
+
+    desc "Run AWS Integration Tests"
+    RSpec::Core::RakeTask.new(:integration) do |t|
+      t.pattern = "spec/integration/**/*_spec.rb"
+      t.rspec_opts = %w(--format progress --color)
+    end
   end
 
   desc "Run tests"
-  task :spec => %w(spec:unit)
+  task :spec => %w(spec:unit spec:integration)
 end
 
 task :default => ["spec"]

data/bin/cyoi

@@ -2,8 +2,26 @@
 $:.push File.dirname(__FILE__) + '/../lib'
 
 require "rubygems"
-require "cyoi/cli/provider"
 
 # interface assumed by aruba in-process testing
 # https://github.com/cucumber/aruba#testing-ruby-cli-programs-without-spawning-a-new-ruby-process
-Cyoi::Cli::Provider.new(ARGV.dup).execute!
+
+section, *argv = ARGV.dup
+cli = case (section || "").downcase.to_sym
+when :provider
+  require "cyoi/cli/provider"
+  Cyoi::Cli::Provider.new(argv)
+when :address
+  require "cyoi/cli/address"
+  Cyoi::Cli::Address.new(argv)
+else
+  $stderr.puts "USAGE: cyoi [provider|address]"
+  exit 1
+end
+
+# TODO put this behind a flag --fog-mock
+require "fog"
+Fog.mock!
+
+cli.show_settings
+cli.execute!

data/cyoi.gemspec

@@ -22,6 +22,7 @@ README
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "fog"
   spec.add_dependency "highline", "~> 1.6"
   spec.add_dependency "settingslogic", "~> 2.0.9" # need to_nested_hash method
 

data/lib/cyoi/cli/address.rb

@@ -0,0 +1,59 @@
+require "cyoi/cli"
+require "cyoi/cli/auto_detection"
+require "cyoi/cli/helpers"
+class Cyoi::Cli::Address
+  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_address?
+      settings["address"] = address_cli.perform_and_return_attributes
+      save_settings!
+    end
+    address_cli.display_confirmation
+  end
+
+  # Continue the interactive session with the user
+  # specific to the address/infrastructure they have
+  # chosen.
+  #
+  # The returned object is a class from cyoi/cli/addresss/provier_cli_NAME.rb
+  # The class loads itself into `@address_clis` via `register_address_cli`
+  #
+  # Returns nil if settings.address.name not set
+  def address_cli
+    @address_cli ||= begin
+      provider_name = settings.exists?("provider.name")
+      return nil unless provider_name
+      require "cyoi/cli/provider_addresses/address_cli_#{settings.provider.name}"
+      klass = self.class.address_cli(settings.provider.name)
+      settings["address"] ||= {}
+      klass.new(provider_client, settings.address, hl)
+    end
+  end
+
+  def self.register_address_cli(name, klass)
+    @address_clis ||= {}
+    @address_clis[name] = klass
+  end
+
+  def self.address_cli(name)
+    @address_clis[name]
+  end
+
+  protected
+  def valid_address?
+    address_cli && address_cli.valid_address?
+  end
+
+end

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

@@ -0,0 +1,14 @@
+require "cyoi/providers"
+
+module Cyoi::Cli::Helpers::Provider
+  def provider_client
+    @provider_client ||= begin
+      Cyoi::Providers.provider_client(settings.provider)
+    end
+  end
+
+  # If the +provider_client+ uses fog, then this will return its +fog_compute+ client object
+  def fog_compute
+    provider_client.respond_to?(:fog_compute) ? provider_client.fog_compute : nil
+  end
+end

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

@@ -40,6 +40,10 @@ module Cyoi::Cli::Helpers::Settings
     settings.create_accessors!
   end
 
+  def show_settings
+    puts "Using settings file #{settings_path}"
+  end
+
   def migrate_old_settings
   end
 end

data/lib/cyoi/cli/helpers.rb

@@ -2,9 +2,11 @@ module Cyoi::Cli::Helpers
 end
 
 require "cyoi/cli/helpers/interactions"
+require "cyoi/cli/helpers/provider"
 require "cyoi/cli/helpers/settings"
 
 module Cyoi::Cli::Helpers
   include Cyoi::Cli::Helpers::Interactions
+  include Cyoi::Cli::Helpers::Provider
   include Cyoi::Cli::Helpers::Settings
 end

data/lib/cyoi/cli/provider_addresses/address_cli_aws.rb

@@ -0,0 +1,44 @@
+module Cyoi::Cli::Addresses; end
+class Cyoi::Cli::Addresses::AddressCliAws
+  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) ? Settingslogic.new(attributes) : attributes
+    raise "@attributes must be Settingslogic (or Hash)" unless @attributes.is_a?(Settingslogic)
+  end
+
+  def perform_and_return_attributes
+    unless valid_address?
+      provision_address
+    end
+    export_attributes
+  end
+
+  # helper to export the complete nested attributes.
+  def export_attributes
+    attributes.to_nested_hash
+  end
+
+
+  def valid_address?
+    attributes["ip"]
+  end
+
+  def display_confirmation
+    puts "\n"
+    puts "Confirming: Using address #{attributes.ip}"
+  end
+
+  protected
+  def provision_address
+    print "Acquiring a public IP address... "
+    attributes["ip"] = provider_client.provision_public_ip_address
+    puts attributes.ip
+  end
+end
+
+Cyoi::Cli::Address.register_address_cli("aws", Cyoi::Cli::Addresses::AddressCliAws)

data/lib/cyoi/providers/README.md

@@ -0,0 +1,5 @@
+# Providers
+
+Currently these files are kept in sync with bosh-cloudfoundry project.
+
+TODO - extract into shared library.

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

@@ -0,0 +1,168 @@
+# Copyright (c) 2012-2013 Stark & Wayne, LLC
+
+module Cyoi; module Providers; module Clients; end; end; end
+
+require "cyoi/providers/clients/fog_provider_client"
+require "cyoi/providers/constants/aws_constants"
+
+class Cyoi::Providers::Clients::AwsProviderClient < Cyoi::Providers::Clients::FogProviderClient
+  include Cyoi::Providers::Constants::AwsConstants
+
+  # @return [Integer] megabytes of RAM for requested flavor of server
+  def ram_for_server_flavor(server_flavor_id)
+    if flavor = fog_compute_flavor(server_flavor_id)
+      flavor[:ram]
+    else
+      raise "Unknown AWS flavor '#{server_flavor_id}'"
+    end
+  end
+
+  # @return [Hash] e.g. { :bits => 0, :cores => 2, :disk => 0,
+  #   :id => 't1.micro', :name => 'Micro Instance', :ram => 613}
+  # or nil if +server_flavor_id+ is not a supported flavor ID
+  def fog_compute_flavor(server_flavor_id)
+    aws_compute_flavors.find { |fl| fl[:id] == server_flavor_id }
+  end
+
+  # @return [Array] of [Hash] for each supported compute flavor
+  # Example [Hash] { :bits => 0, :cores => 2, :disk => 0,
+  #   :id => 't1.micro', :name => 'Micro Instance', :ram => 613}
+  def aws_compute_flavors
+    Fog::Compute::AWS::FLAVORS
+  end
+
+  def aws_compute_flavor_ids
+    aws_compute_flavors.map { |fl| fl[:id] }
+  end
+
+  # Provision an EC2 or VPC elastic IP addess.
+  # * VPC - provision_public_ip_address(vpc: true)
+  # * EC2 - provision_public_ip_address
+  # @return [String] provisions a new public IP address in target region
+  # TODO nil if none available
+  def provision_public_ip_address(options={})
+    if options.delete(:vpc)
+      options[:domain] = "vpc"
+    else
+      options[:domain] = options.delete(:domain) || "standard"
+    end
+    address = fog_compute.addresses.create(options)
+    address.public_ip
+    # TODO catch error and return nil
+  end
+
+  def associate_ip_address_with_server(ip_address, server)
+    address = fog_compute.addresses.get(ip_address)
+    address.server = server
+  end
+
+  def create_vpc(name, cidr_block)
+    vpc = fog_compute.vpcs.create(name: name, cidr_block: cidr_block)
+    vpc.id
+  end
+
+  # Creates a VPC subnet
+  # @return [String] the subnet_id
+  def create_subnet(vpc_id, cidr_block)
+    subnet = fog_compute.subnets.create(vpc_id: vpc_id, cidr_block: cidr_block)
+    subnet.subnet_id
+  end
+
+  def create_internet_gateway(vpc_id)
+    gateway = fog_compute.internet_gateways.create(vpc_id: vpc_id)
+    gateway.id
+  end
+
+  def find_server_device(server, device)
+    server.volumes.all.find {|v| v.device == device}
+  end
+
+  def create_and_attach_volume(name, disk_size, server, device)
+    volume = fog_compute.volumes.create(
+        size: disk_size,
+        name: name,
+        description: '',
+        device: device,
+        availability_zone: server.availability_zone)
+    # TODO: the following works in fog 1.9.0+ (but which has a bug in bootstrap)
+    # https://github.com/fog/fog/issues/1516
+    #
+    # volume.wait_for { volume.status == 'available' }
+    # volume.attach(server.id, "/dev/vdc")
+    # volume.wait_for { volume.status == 'in-use' }
+    #
+    # Instead, using:
+    volume.server = server
+  end
+
+  # Ubuntu 13.04
+  def raring_image_id(region=nil)
+    region = fog_compute.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
+
+  def bootstrap(new_attributes = {})
+    new_attributes[:image_id] ||= raring_image_id(fog_compute.region)
+    vpc = new_attributes[:subnet_id]
+
+    server = fog_compute.servers.new(new_attributes)
+
+    unless new_attributes[:key_name]
+      raise "please provide :key_name attribute"
+    end
+    unless private_key_path = new_attributes.delete(:private_key_path)
+      raise "please provide :private_key_path attribute"
+    end
+
+    if vpc
+      # TODO setup security group on new server
+    else
+      # make sure port 22 is open in the first security group
+      security_group = fog_compute.security_groups.get(server.groups.first)
+      authorized = security_group.ip_permissions.detect do |ip_permission|
+        ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
+        ip_permission['fromPort'] == 22 &&
+        ip_permission['ipProtocol'] == 'tcp' &&
+        ip_permission['toPort'] == 22
+      end
+      unless authorized
+        security_group.authorize_port_range(22..22)
+      end
+    end
+
+    server.save
+    unless Fog.mocking?
+      server.wait_for { ready? }
+      server.setup(:keys => [private_key_path])
+    end
+    server
+  end
+
+  # Construct a Fog::Compute object
+  # Uses +attributes+ which normally originates from +settings.provider+
+  def setup_fog_connection
+    configuration = Fog.symbolize_credentials(attributes.credentials)
+    configuration[:provider] = "AWS"
+    configuration[:region] = attributes.region
+    @fog_compute = Fog::Compute.new(configuration)
+  end
+end

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

@@ -0,0 +1,161 @@
+# Copyright (c) 2012-2013 Stark & Wayne, LLC
+
+require "fog"
+module Cyoi; module Providers; module Clients; end; end; end
+
+class Cyoi::Providers::Clients::FogProviderClient
+  attr_reader :fog_compute
+  attr_reader :attributes
+
+  def initialize(attributes)
+    @attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
+    raise "@attributes must be Settingslogic (or Hash)" unless @attributes.is_a?(Settingslogic)
+    setup_fog_connection
+  end
+
+  def setup_fog_connection
+    raise "must implement"
+  end
+
+  def create_key_pair(key_pair_name)
+    fog_compute.key_pairs.create(:name => key_pair_name)
+  end
+
+  # set_resource_name(fog_server, "inception")
+  # set_resource_name(volume, "inception-root")
+  # set_resource_name(volume, "inception-store")
+  def set_resource_name(resource, name)
+    fog_compute.tags.create :key => "Name", :value => name, :resource_id => resource.id
+  end
+
+  def delete_key_pair_if_exists(key_pair_name)
+    if fog_key_pair = fog_compute.key_pairs.get(key_pair_name)
+      fog_key_pair.destroy
+    end
+  end
+
+  def delete_servers_with_name(name)
+    fog_compute.servers.select {|s| s.tags["Name"].downcase == name.downcase }.each do |server|
+      puts "Destroying server #{server.id}..."
+      server.destroy
+    end
+  end
+
+  def delete_volumes_with_name(name)
+    fog_compute.volumes.select do |v|
+      volume_name = v.tags["Name"]
+      volume_name && volume_name.downcase == name.downcase
+    end.each do |volume|
+      puts "Destroying volume #{volume.id}..."
+      volume.destroy
+    end
+  end
+
+  # Destroy all IP addresses that aren't bound to a server
+  def cleanup_unused_ip_addresses
+    fog_compute.addresses.each do |a|
+      unless a.server
+        puts "Deleting unused IP address #{a.public_ip}..."
+        a.destroy
+      end
+    end
+  end
+
+  # Creates or reuses an security group and opens ports.
+  #
+  # +security_group_name+ is the name to be created or reused
+  # +ports+ is a hash of name/port for ports to open, for example:
+  # {
+  #   ssh: 22,
+  #   http: 80,
+  #   https: 443
+  # }
+  # protocol defaults to TCP
+  # You can also use a more verbose +ports+ using the format:
+  # {
+  #   ssh: 22,
+  #   http: { ports: (80..82) },
+  #   mosh: { protocol: "udp", ports: (60000..60050) }
+  #   mosh: { protocol: "rdp", ports: (3398..3398), ip_ranges: [ { cidrIp: "196.212.12.34/32" } ] }
+  # }
+  # In this example, 
+  #  * TCP 22 will be opened for ssh from any ip_range,
+  #  * TCP ports 80, 81, 82 for http from any ip_range,
+  #  * UDP 60000 -> 60050 for mosh from any ip_range and
+  #  * TCP 3398 for RDP from ip range: 96.212.12.34/32
+  def create_security_group(security_group_name, description, ports)
+    security_groups = fog_compute.security_groups
+    unless sg = security_groups.find { |s| s.name == security_group_name }
+      sg = fog_compute.security_groups.create(name: security_group_name, description: description)
+      puts "Created security group #{security_group_name}"
+    else
+      puts "Reusing security group #{security_group_name}"
+    end
+    ip_permissions = ip_permissions(sg)
+    ports_opened = 0
+    ports.each do |name, port_defn|
+      (protocol, port_range, ip_range) = extract_port_definition(port_defn)
+      unless port_open?(ip_permissions, port_range, protocol, ip_range)
+        authorize_port_range(sg, port_range, protocol, ip_range)
+        puts " -> opened #{name} ports #{protocol.upcase} #{port_range.min}..#{port_range.max} from IP range #{ip_range}"
+        ports_opened += 1
+      end
+    end
+    puts " -> no additional ports opened" if ports_opened == 0
+    true
+  end
+
+  def port_open?(ip_permissions, port_range, protocol, ip_range)
+    ip_permissions && ip_permissions.find do |ip| 
+      ip["ipProtocol"] == protocol \
+      && ip["ipRanges"].detect { |range| range["cidrIp"] == ip_range } \
+      && ip["fromPort"] <= port_range.min \
+      && ip["toPort"] >= port_range.max
+    end
+  end
+
+  def authorize_port_range(sg, port_range, protocol, ip_range)
+    sg.authorize_port_range(port_range, {:ip_protocol => protocol, :cidr_ip => ip_range})
+  end
+
+  def ip_permissions(sg)
+    sg.ip_permissions
+  end
+
+  # Any of the following +port_defn+ can be used:
+  # {
+  #   ssh: 22,
+  #   http: { ports: (80..82) },
+  #   mosh: { protocol: "udp", ports: (60000..60050) }
+  #   mosh: { protocol: "rdp", ports: (3398..3398), ip_range: "196.212.12.34/32" }
+  # }
+  # In this example,
+  #  * TCP 22 will be opened for ssh from any ip_range,
+  #  * TCP ports 80, 81, 82 for http from any ip_range,
+  #  * UDP 60000 -> 60050 for mosh from any ip_range and
+  #  * TCP 3398 for RDP from ip range: 96.212.12.34/32
+  def extract_port_definition(port_defn)
+    protocol = "tcp"
+    ip_range = "0.0.0.0/0"
+    if port_defn.is_a? Integer
+      port_range = (port_defn..port_defn)
+    elsif port_defn.is_a? Range
+      port_range = port_defn
+    elsif port_defn.is_a? Hash
+      protocol = port_defn[:protocol] if port_defn[:protocol]
+      port_range = port_defn[:ports]  if port_defn[:ports]
+      ip_range = port_defn[:ip_range] if port_defn[:ip_range]
+    end
+    [protocol, port_range, ip_range]
+  end
+
+  def provision_or_reuse_public_ip_address(options={})
+    provision_public_ip_address(options) || find_unused_public_ip_address(options)
+  end
+
+  def find_unused_public_ip_address(options={})
+    if address = fog_compute.addresses.find { |s| s.server_id.nil? }
+      address.public_ip
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+# Copyright (c) 2012-2013 Stark & Wayne, LLC
+
+module Cyoi; module Providers; module Clients; end; end; end
+
+require "cyoi/providers/clients/fog_provider_client"
+require "cyoi/providers/constants/openstack_constants"
+
+class Cyoi::Providers::Clients::OpenStackProviderClient < Cyoi::Providers::Clients::FogProviderClient
+  # @return [String] provisions a new public IP address in target region
+  # TODO nil if none available
+  def provision_public_ip_address(options={})
+    address = fog_compute.addresses.create
+    address.ip
+    # TODO catch error and return nil
+  end
+
+  def associate_ip_address_with_server(ip_address, server)
+    address = fog_compute.addresses.find { |a| a.ip == ip_address }
+    address.server = server
+  end
+
+  # Hook method for FogProviderClient#create_security_group
+  def ip_permissions(sg)
+    sg.rules
+  end
+
+  # Hook method for FogProviderClient#create_security_group
+  def authorize_port_range(sg, port_range, protocol, ip_range)
+    sg.create_security_group_rule(port_range.min, port_range.max, protocol, ip_range)
+  end
+
+  def find_server_device(server, device)
+    va = fog_compute.get_server_volumes(server.id).body['volumeAttachments']
+    va.find { |v| v["device"] == device }
+  end
+
+  def create_and_attach_volume(name, disk_size, server, device)
+    volume = fog_compute.volumes.create(:name => name,
+                                        :description => "",
+                                        :size => disk_size,
+                                        :availability_zone => server.availability_zone)
+    volume.wait_for { volume.status == 'available' }
+    volume.attach(server.id, device)
+    volume.wait_for { volume.status == 'in-use' }
+  end
+
+  def delete_security_group_and_servers(sg_name)
+    raise "not implemented yet"
+  end
+
+  # Construct a Fog::Compute object
+  # Uses +attributes+ which normally originates from +settings.provider+
+  def setup_fog_connection
+    configuration = Fog.symbolize_credentials(attributes.credentials)
+    configuration[:provider] = "OpenStack"
+    unless attributes.region == openstack_constants.no_region_code
+      configuration[:openstack_region] = attributes.region
+    end
+    @fog_compute = Fog::Compute.new(configuration)
+  end
+
+  def openstack_constants
+    Cyoi::Providers::Constants::OpenStackConstants
+  end
+end

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

@@ -0,0 +1,25 @@
+# Copyright (c) 2012-2013 Stark & Wayne, LLC
+
+module Cyoi; module Providers; module Constants; end; end; end
+
+module Cyoi::Providers::Constants::AwsConstants
+  extend self
+
+  # 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" },
+    ]
+  end
+
+  def default_region_code
+    "us-east-1"
+  end
+end

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

@@ -0,0 +1,12 @@
+# Copyright (c) 2012-2013 Stark & Wayne, LLC
+
+module Cyoi; module Providers; module Constants; end; end; end
+
+module Cyoi::Providers::Constants::OpenStackConstants
+  extend self
+
+  # explicit value representing "no region requested"
+  def no_region_code
+    "no-region-requested"
+  end
+end

data/lib/cyoi/providers.rb

@@ -0,0 +1,28 @@
+# Copyright (c) 2012-2013 Stark & Wayne, LLC
+
+module Cyoi; end
+
+module Cyoi::Providers
+  extend self
+
+  # returns a Infrastructure provider specific object
+  # with helpers related to that provider
+  # returns nil if +attributes.name+ is unknown
+  def provider_client(attributes)
+    attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
+    case attributes.name.to_sym
+    when :aws
+      @aws_provider_client ||= begin
+        require "cyoi/providers/clients/aws_provider_client"
+        Cyoi::Providers::Clients::AwsProviderClient.new(attributes)
+      end
+    when :openstack
+      @openstack_provider_client ||= begin
+        require "cyoi/providers/clients/openstack_provider_client"
+        Cyoi::Providers::Clients::OpenStackProviderClient.new(attributes)
+      end
+    else
+      nil
+    end
+  end
+end

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/integration/cli/address/address_aws_spec.rb

@@ -0,0 +1,36 @@
+describe "cyoi address aws" do
+  include Cyoi::Cli::Helpers::Settings
+  include SettingsHelper
+  include Aruba::Api
+  before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
+
+  it "fails nicely if provider.name missing" do
+    run_interactive(unescape("cyoi address #{settings_dir}"))
+    assert_failing_with("Please run 'cyoi provider' first")
+  end
+
+  describe "provider setup and" 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
+
+    it "address aleady assigned" 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"
+      setting "address.ip", "1.2.3.4"
+      run_interactive(unescape("cyoi address #{settings_dir}"))
+      assert_passing_with("Confirming: Using address 1.2.3.4")
+    end
+
+    it "address is provisioned from AWS" do
+      run_interactive(unescape("cyoi address #{settings_dir}"))
+      assert_passing_with("Confirming: Using address")
+    end
+  end
+
+end

data/spec/integration/cli/{provider_aws_spec.rb → provider/provider_aws_spec.rb}

@@ -1,4 +1,4 @@
-describe "cyoi aws" do
+describe "cyoi provider aws" do
   include Cyoi::Cli::Helpers::Settings
   include SettingsHelper
   include Aruba::Api
@@ -9,12 +9,12 @@ describe "cyoi aws" do
     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 #{settings_dir}"))
+    run_interactive(unescape("cyoi provider #{settings_dir}"))
     assert_passing_with("Confirming: Using AWS/us-west-2")
   end
 
   it "prompts for provider, user chooses aws" do
-    run_interactive(unescape("cyoi #{settings_dir}"))
+    run_interactive(unescape("cyoi provider #{settings_dir}"))
     type("1")
     type("ACCESS")
     type("SECRET")
@@ -43,7 +43,7 @@ Confirming: Using AWS/us-west-2
   it "auto-detects aws options in ~/.fog" do
     setup_home_dir
     setup_fog_with_various_accounts_setup
-    run_interactive(unescape("cyoi #{settings_dir}"))
+    run_interactive(unescape("cyoi provider #{settings_dir}"))
     type("3")
     type("6")
     type("")

data/spec/integration/cli/{provider_openstack_spec.rb → provider/provider_openstack_spec.rb}

@@ -1,4 +1,4 @@
-describe "cyoi openstack" do
+describe "cyoi provider openstack" do
   include Cyoi::Cli::Helpers::Settings
   include SettingsHelper
   include Aruba::Api
@@ -11,12 +11,12 @@ describe "cyoi openstack" do
     setting "provider.credentials.openstack_tenant", "TENANT"
     setting "provider.credentials.openstack_auth_url", "TOKENURL"
     setting "provider.region", "us-west"
-    run_interactive(unescape("cyoi #{settings_dir}"))
+    run_interactive(unescape("cyoi provider #{settings_dir}"))
     assert_passing_with("Confirming: Using OpenStack/us-west")
   end
 
   it "prompts for everything (no region)" do
-    run_interactive(unescape("cyoi #{settings_dir}"))
+    run_interactive(unescape("cyoi provider #{settings_dir}"))
     type("2")
     type("USERNAME")
     type("PASSWORD")
@@ -37,7 +37,7 @@ Confirming: Using OpenStack
   end
 
   it "prompts for everything (with region)" do
-    run_interactive(unescape("cyoi #{settings_dir}"))
+    run_interactive(unescape("cyoi provider #{settings_dir}"))
     type("2")
     type("USERNAME")
     type("PASSWORD")
@@ -60,7 +60,7 @@ Confirming: Using OpenStack/REGION
   it "auto-detects several openstack options in ~/.fog" do
     setup_home_dir
     setup_fog_with_various_accounts_setup
-    run_interactive(unescape("cyoi #{settings_dir}"))
+    run_interactive(unescape("cyoi provider #{settings_dir}"))
     type("4")
     type("REGION")
     type("")

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ $:.unshift(File.expand_path("../../lib", __FILE__))
 require "rspec/core"
 require "cyoi"
 require "cyoi/cli/provider"
+require "cyoi/cli/address"
 
 require "aruba/api"
 

data/spec/support/settings_helper.rb

@@ -1,4 +1,4 @@
-# assumes @cmd is Inception::Cli instance
+# assumes @cmd is Cyoi::Cli instance
 module SettingsHelper
   # Set a nested setting with "key1.key2.key3" notation
   def setting(nested_key, value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +135,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- ChangeLog.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -128,19 +145,30 @@ files:
 - cyoi.gemspec
 - lib/cyoi.rb
 - lib/cyoi/cli.rb
+- lib/cyoi/cli/address.rb
 - lib/cyoi/cli/auto_detection.rb
 - lib/cyoi/cli/auto_detection/auto_detection_fog.rb
 - lib/cyoi/cli/helpers.rb
 - lib/cyoi/cli/helpers/interactions.rb
+- lib/cyoi/cli/helpers/provider.rb
 - lib/cyoi/cli/helpers/settings.rb
 - lib/cyoi/cli/provider.rb
+- lib/cyoi/cli/provider_addresses/address_cli_aws.rb
 - lib/cyoi/cli/providers/provider_cli.rb
 - lib/cyoi/cli/providers/provider_cli_aws.rb
 - lib/cyoi/cli/providers/provider_cli_openstack.rb
+- lib/cyoi/providers.rb
+- lib/cyoi/providers/README.md
+- lib/cyoi/providers/clients/aws_provider_client.rb
+- lib/cyoi/providers/clients/fog_provider_client.rb
+- lib/cyoi/providers/clients/openstack_provider_client.rb
+- lib/cyoi/providers/constants/aws_constants.rb
+- lib/cyoi/providers/constants/openstack_constants.rb
 - lib/cyoi/version.rb
 - spec/.DS_Store
-- spec/integration/cli/provider_aws_spec.rb
-- spec/integration/cli/provider_openstack_spec.rb
+- spec/integration/cli/address/address_aws_spec.rb
+- spec/integration/cli/provider/provider_aws_spec.rb
+- spec/integration/cli/provider/provider_openstack_spec.rb
 - spec/spec_helper.rb
 - spec/support/settings_helper.rb
 - spec/support/stdout_capture.rb
@@ -160,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -525265882681601916
+      hash: -3618245978349613620
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -525265882681601916
+      hash: -3618245978349613620
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -183,8 +211,9 @@ summary: A library to ask an end-user to choose an infrastructure (AWS, OpenStac
   their infrastructure (say via [fog](http://fog.io)).
 test_files:
 - spec/.DS_Store
-- spec/integration/cli/provider_aws_spec.rb
-- spec/integration/cli/provider_openstack_spec.rb
+- spec/integration/cli/address/address_aws_spec.rb
+- spec/integration/cli/provider/provider_aws_spec.rb
+- spec/integration/cli/provider/provider_openstack_spec.rb
 - spec/spec_helper.rb
 - spec/support/settings_helper.rb
 - spec/support/stdout_capture.rb