cyoi 0.9.2 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQ0ZGE5ZDMzMzU5MGZiZDcxMTBjZDNiMTk2ZmRhZWFkZmM5ZjUwOA==
+    MDdkOWUzMjRmM2Q4OThkNmFkNjc5NDJlMjQxN2NhZTYwZGRhMDdiNQ==
   data.tar.gz: !binary |-
-    MTdhYWE3Njg5YzE4YTE5MWE0MzVkNTdlZGEyYzQ5MjFkYWI2M2I5Zg==
+    NTA2ZDgyZTFiZWI5OTA5MzA2NzgyMjU0ZjcxMzk2Y2E5M2ZiODUyNw==
 SHA512:
   metadata.gz: !binary |-
-    NGY1ZmIxY2E2ZDIzZWE5YThhZWU5NmMzZGZlMTIwYTBmMGQ4ODUxNzlmZjEy
-    ZjQ1NjYyNGRmMmMxMDFhMWQxYjQxN2MxMTBmNmQ3MzY5ZmYxYzQxZjkwODhj
-    MTlmZjU2NDFhYWY5NDkzMDQzYWIyNWUxMGIwZjQwMmQyMDNiNDA=
+    NTNkM2FiZDczOGEzYzAxYjZhNTBlZWU3Yjc2ZTBmYzlhZmEzYmE0MjkxODIx
+    ZGIzZGVmMjhmZmUzMjI0MzMxOGY0YzQ3ZjQwYzllNjVhNGM5ZjMxMmJjMGNm
+    NzRlNmRkMmQ5ZTAyODFjY2NjMTZkYzA2Yjk3ZWQ3OGFkZDRmOWI=
   data.tar.gz: !binary |-
-    NDcxMzIyZGQ4NzZjZDliNDVmNzgxMGNmOWFlNjI0ZDVhYTY1YWM4YzM0MTBh
-    OGViMDkxYzE4YmI4MTIyYmNkOWE4NzZhMmVmNWZjMDdiOWZiNjU4OTVlOGNh
-    ODA3M2E5YTBkNDIzMDNkN2NjYzM5OWI5YjQ2NzdlMWZiOTFjNTA=
+    MTg1YTFlZWU4NzNmZGE1MzM1YTI4OTVkZjI5MGUwN2RlNjk0ZmI1MWFiZWI5
+    NzhkNTc3ODQ4NjkzYTY3YWM4NzMxNzg2ZWJiMzM5MjcwNjdiMjQzMDE3YmEy
+    NGU4Y2VlNDQ5YWYwZGVlNTM0ODczZjZjNTA0NTA3OTVmY2Q1N2E=

data/ChangeLog.md

@@ -3,6 +3,11 @@ 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.10
+-----
+
+- `blobstores` - create a bucket/container on AWS/OpenStack
+
 v0.9
 ----
 

data/bin/cyoi

@@ -17,11 +17,14 @@ when :address
 when :image
   require "cyoi/cli/image"
   Cyoi::Cli::Image.new(argv)
+when :blobstore
+  require "cyoi/cli/blobstore"
+  Cyoi::Cli::Blobstore.new(argv)
 when :keypair, :key_pair
   require "cyoi/cli/key_pair"
   Cyoi::Cli::KeyPair.new(argv)
 else
-  $stderr.puts "USAGE: cyoi [provider|address|key_pair]"
+  $stderr.puts "USAGE: cyoi [provider|address|image|blobstore|key_pair]"
   exit 1
 end
 
@@ -30,4 +33,4 @@ require "fog"
 Fog.mock!
 
 cli.show_settings
-cli.execute!
+cli.execute!

data/lib/cyoi/cli/blobstore.rb

@@ -0,0 +1,65 @@
+require "cyoi/cli"
+require "cyoi/cli/auto_detection"
+require "cyoi/cli/helpers"
+class Cyoi::Cli::Blobstore
+  include Cyoi::Cli::Helpers
+
+  attr_reader :blobstore_name
+
+  def initialize(argv, stdin=STDIN, stdout=STDOUT, stderr=STDERR, kernel=Kernel)
+    @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+    unless @blobstore_name = @argv.shift
+      raise "Please provide blobstore name as first argument"
+    end
+    @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") && settings.exists?("provider.credentials")
+      $stderr.puts("Please run 'cyoi provider' first")
+      exit 1
+    end
+
+    settings["blobstore"] = perform_and_return_attributes
+    save_settings!
+
+    blobstore_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_blobstore/provier_cli_INFRASTRUCTURE.rb
+  # The class loads itself into `@blobstore_clis` via `register_blobstore_cli`
+  #
+  # Returns nil if settings.key_pair.name not set
+  def blobstore_cli
+    @blobstore_cli ||= begin
+      provider_name = settings.exists?("provider.name")
+      return nil unless provider_name
+      require "cyoi/cli/provider_blobstore/blobstore_cli_#{settings.provider.name}"
+
+      settings["blobstore"] ||= {}
+      settings.blobstore["name"] = blobstore_name
+
+      klass = self.class.blobstore_cli(settings.provider.name)
+      klass.new(provider_client, settings.blobstore, hl)
+    end
+  end
+
+  def perform_and_return_attributes
+    blobstore_cli.perform_and_return_attributes
+  end
+
+  def self.register_cli(name, klass)
+    @blobstore_clis ||= {}
+    @blobstore_clis[name] = klass
+  end
+
+  def self.blobstore_cli(name)
+    @blobstore_clis[name]
+  end
+
+end

data/lib/cyoi/cli/key_pair.rb

@@ -41,9 +41,11 @@ class Cyoi::Cli::KeyPair
       provider_name = settings.exists?("provider.name")
       return nil unless provider_name
       require "cyoi/cli/provider_key_pair/key_pair_#{settings.provider.name}"
-      klass = self.class.key_pair_cli(settings.provider.name)
+
       settings["key_pair"] ||= {}
       settings.key_pair["name"] = key_pair_name
+
+      klass = self.class.key_pair_cli(settings.provider.name)
       klass.new(provider_client, settings.key_pair, hl)
     end
   end
@@ -61,4 +63,4 @@ class Cyoi::Cli::KeyPair
   def valid?
     key_pair_cli && key_pair_cli.valid?
   end
-end
+end

data/lib/cyoi/cli/provider_blobstore/blobstore_cli_aws.rb

@@ -0,0 +1,5 @@
+require "cyoi/cli/provider_blobstore/blobstore_cli_base"
+class Cyoi::Cli::Blobstore::BlobstoreCliAws < Cyoi::Cli::Blobstore::BlobstoreCliBase
+end
+
+Cyoi::Cli::Blobstore.register_cli("aws", Cyoi::Cli::Blobstore::BlobstoreCliAws)

data/lib/cyoi/cli/provider_blobstore/blobstore_cli_base.rb

@@ -0,0 +1,29 @@
+class Cyoi::Cli::Blobstore; end
+class Cyoi::Cli::Blobstore::BlobstoreCliBase
+  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
+    # create blobstore OR show how many blobstore already exist in blobstore
+    provider_client.create_blobstore(attributes["name"])
+    export_attributes
+  end
+
+  # helper to export the complete nested attributes.
+  def export_attributes
+    attributes.to_nested_hash
+  end
+
+  def display_confirmation
+    puts "\n"
+    puts "Confirming: Using blobstore #{attributes["name"]}"
+  end
+end

data/lib/cyoi/cli/provider_blobstore/blobstore_cli_openstack.rb

@@ -0,0 +1,5 @@
+require "cyoi/cli/provider_blobstore/blobstore_cli_base"
+class Cyoi::Cli::Blobstore::BlobstoreCliOpenStack < Cyoi::Cli::Blobstore::BlobstoreCliBase
+end
+
+Cyoi::Cli::Blobstore.register_cli("aws", Cyoi::Cli::Blobstore::BlobstoreCliOpenStack)

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

@@ -174,6 +174,14 @@ class Cyoi::Providers::Clients::AwsProviderClient < Cyoi::Providers::Clients::Fo
     server
   end
 
+  def fog_storage
+    @fog_storage ||= begin
+      configuration = Fog.symbolize_credentials(attributes.credentials)
+      configuration[:provider] = "AWS"
+      Fog::Storage.new(configuration)
+    end
+  end
+
   # Construct a Fog::Compute object
   # Uses +attributes+ which normally originates from +settings.provider+
   def setup_fog_connection

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

@@ -17,6 +17,26 @@ class Cyoi::Providers::Clients::FogProviderClient
   def setup_fog_connection
   end
 
+  def supports_blobstore_service?
+    fog_storage
+  rescue
+    false
+  end
+
+  def create_blobstore(blobstore_name)
+    unless supports_blobstore_service?
+      puts "Provider does not support blobstore service"
+      false
+    else
+      print "Attempting to create blobstore #{blobstore_name}... "
+      blobstore = fog_storage.directories.create(key: blobstore_name)
+      puts "done"
+      blobstore
+    end
+  rescue Excon::Errors::Conflict => e
+    puts "failed: blobstore already exists but owned by someone else"
+  end
+
   def create_key_pair(key_pair_name)
     print "Acquiring a key pair #{key_pair_name}... "
     key_pair = fog_compute.key_pairs.create(:name => key_pair_name)

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

@@ -112,6 +112,12 @@ class Cyoi::Providers::Clients::OpenStackProviderClient < Cyoi::Providers::Clien
     configuration
   end
 
+  # May throw odd exception if OpenStack doesn't support Swift, like:
+  #   NoMethodError: undefined method `join' for "object-store":String
+  def fog_storage
+    @fog_storage ||= Fog::Storage.new(configuration)
+  end
+
   # Construct a Fog::Compute object
   # Uses +attributes+ which normally originates from +settings.provider+
   def setup_fog_connection

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -147,6 +147,7 @@ files:
 - lib/cyoi/cli/address.rb
 - lib/cyoi/cli/auto_detection.rb
 - lib/cyoi/cli/auto_detection/auto_detection_fog.rb
+- lib/cyoi/cli/blobstore.rb
 - lib/cyoi/cli/helpers.rb
 - lib/cyoi/cli/helpers/interactions.rb
 - lib/cyoi/cli/helpers/provider.rb
@@ -157,6 +158,9 @@ files:
 - lib/cyoi/cli/provider_addresses/address_cli_aws.rb
 - lib/cyoi/cli/provider_addresses/address_cli_openstack.rb
 - lib/cyoi/cli/provider_addresses/address_cli_vsphere.rb
+- lib/cyoi/cli/provider_blobstore/blobstore_cli_aws.rb
+- lib/cyoi/cli/provider_blobstore/blobstore_cli_base.rb
+- lib/cyoi/cli/provider_blobstore/blobstore_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