ey-core 3.4.5 → 3.5.0

data/README.md

@@ -1,78 +1,78 @@
-# Ey::Core
-
-Official Ruby Engine Yard Core API Client.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'ey-core'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install ey-core
-
-## Usage
-
-Uses [cistern](https://github.com/lanej/cistern) to wrap RESTful resources nicely.
-
-```ruby
-client.users.current  # =>
-<Ey::Core::Client::User
-  id="0037000000uLmCe",
-  name="Josh Lane",
-  email="jlane@engineyard.com",
-  accounts_url="https://api.engineyard.com/users/0037000000uLmCe/accounts"
->
-```
-
-### Authentication
-
-* Via Token
-
-```ruby
-Ey::Core::Client.new(token: "943662ea7d0fad349eeae9f69adb521d")
-```
-
-* Via HMAC
-
-```ruby
-Ey::Core::Client.new(
-  :auth_id  => "943662ea7d0fad",
-  :auth_key => "943662ea7d0fad349eeae9f69adb521d",
-  :logger   => Logger.new(STDOUT),
-)
-```
-
-### Mock
-
-Mock is disabled by default.
-
-```ruby
-Ey::Core::Client.mocking? # => false
-Ey::Core::Client.mock!
-Ey::Core::Client.mocking? # => true
-```
-
-Reset the mock
-
-```ruby
-Ey::Core::Client.reset!
-```
-
-### Testing
-
-By default, specs are run against the core mock. In order to run them against awsm mocked mode instead, run `MOCK_CORE=false bundle exec rspec`
-
-
-## 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
+# Ey::Core
+
+Official Ruby Engine Yard Core API Client.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'ey-core'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install ey-core
+
+## Usage
+
+Uses [cistern](https://github.com/lanej/cistern) to wrap RESTful resources nicely.
+
+```ruby
+client.users.current  # =>
+<Ey::Core::Client::User
+  id="0037000000uLmCe",
+  name="Josh Lane",
+  email="jlane@engineyard.com",
+  accounts_url="https://api.engineyard.com/users/0037000000uLmCe/accounts"
+>
+```
+
+### Authentication
+
+* Via Token
+
+```ruby
+Ey::Core::Client.new(token: "943662ea7d0fad349eeae9f69adb521d")
+```
+
+* Via HMAC
+
+```ruby
+Ey::Core::Client.new(
+  :auth_id  => "943662ea7d0fad",
+  :auth_key => "943662ea7d0fad349eeae9f69adb521d",
+  :logger   => Logger.new(STDOUT),
+)
+```
+
+### Mock
+
+Mock is disabled by default.
+
+```ruby
+Ey::Core::Client.mocking? # => false
+Ey::Core::Client.mock!
+Ey::Core::Client.mocking? # => true
+```
+
+Reset the mock
+
+```ruby
+Ey::Core::Client.reset!
+```
+
+### Testing
+
+By default, specs are run against the core mock. In order to run them against awsm mocked mode instead, run `MOCK_CORE=false bundle exec rspec`
+
+
+## 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

data/Rakefile

@@ -1,18 +1,18 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require 'cucumber/rake/task'
-
-namespace :spec do
-  task :mocked do
-    sh "env MOCK_CORE=true bundle exec rspec spec/"
-  end
-  task :unmocked do
-    sh "env MOCK_CORE=false CORE_URL=http://api-development.localdev.engineyard.com:9292 bundle exec rspec spec/"
-  end
-end
-
-task :spec => ["spec:mocked", "spec:unmocked"]
-
-Cucumber::Rake::Task.new
-
-task default: ["spec:mocked", :cucumber]
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'cucumber/rake/task'
+
+namespace :spec do
+  task :mocked do
+    sh "env MOCK_CORE=true bundle exec rspec spec/"
+  end
+  task :unmocked do
+    sh "env MOCK_CORE=false CORE_URL=http://api-development.localdev.engineyard.com:9292 bundle exec rspec spec/"
+  end
+end
+
+task :spec => ["spec:mocked", "spec:unmocked"]
+
+Cucumber::Rake::Task.new
+
+task default: ["spec:mocked", :cucumber]

data/bin/ey-core

@@ -1,4 +1,12 @@
-#!/usr/bin/env ruby
-require File.expand_path('../../lib/ey-core/cli/main', __FILE__)
-
-Ey::Core::Cli::Main.new(ARGV).execute!
+#!/usr/bin/env ruby
+
+git_path = File.expand_path("../../.git", __FILE__)
+
+if File.exist? git_path
+  lib_dir = File.expand_path("../../lib", __FILE__)
+  $LOAD_PATH.unshift( lib_dir )
+end
+
+require File.expand_path('../../lib/ey-core/cli/main', __FILE__)
+
+Ey::Core::Cli::Main.new(ARGV).execute!

data/examples/add_instance.rb

@@ -1,74 +1,74 @@
-#!/usr/bin/env ruby
-
-# Very basic example of how to add an instance to a given environment.
-# As is attempts to add a t2.micro, see new_server_specs below.
-# For more info visit http://developer.engineyard.com
-
-require 'ey-core'
-require 'optparse'
-require 'yaml'
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: add_instance.rb [options]"
-
-  opts.on('-a', '--account NAME', 'Account name') { |v| options[:account_name] = v }
-  opts.on('-e', '--environment NAME', 'Environment name') { |v| options[:environment_name] = v }
-  opts.on('-n', '--iname NAME', 'Instance name') { |v| options[:instance_name] = v }
-  opts.on('-r', '--irole ROLE', 'Instance role (app, util)') { |v| options[:instance_role] = v }
-  
-end.parse!
-
-# Token comes from '~/.eyrc'
-eyrc = YAML.load_file(File.expand_path("~/.eyrc"))
-
-client = Ey::Core::Client.new(token: eyrc['api_token'])
-
-# Account name as shown in cloud.engineyard.com
-account = client.accounts.first(name: options[:account_name])
-
-# Environment's name
-environment = account.environments.first(name: options[:environment_name])
-
-# Instance's name
-instance_name = options[:instance_name]
-
-puts "Adding app instance #{instance_name} to environment #{environment.name}...."
-
-# TO DO:  read new_server_specs from a file provided as a parameter
-new_server_specs = {
-        :environment     => environment.id,
-        :flavor_id       => "t2_micro",
-        :mnt_volume_size => "10",
-        :name            => instance_name,
-        :role            => options[:instance_role],
-        :volume_size     => "10",
-}
-
-provision_request = client.servers.create!(new_server_specs)
-
-# Provisioning the instance with a timeout of 1200sec.
-# Adjust as necessary depending of the type/role of instance.
-provision_request.ready!(1200)
-
-ap provision_request.attributes
-
-puts "Instance provisioned successfully"
-puts "-------------------"
-
-puts "Waiting for instance #{instance_name} to integrate into the environment #{environment.name}...."
-new_server = provision_request.resource!
-
-new_server.wait_for(1800) { |s| s.state == "running" || s.state == "error" }
-
-if !new_server.enabled? then
-  puts "Adding of instance #{instance_name} into environment #{environment.name} FAILED!!!"
-  puts "Check cloud.engineyard.com for more details"
-  ap new_server.attributes
-  exit
-end
-
-puts "Adding of instance #{instance_name} into environment #{environment.name} SUCCEEDED!!!"
-
-
-
+#!/usr/bin/env ruby
+
+# Very basic example of how to add an instance to a given environment.
+# As is attempts to add a t2.micro, see new_server_specs below.
+# For more info visit http://developer.engineyard.com
+
+require 'ey-core'
+require 'optparse'
+require 'yaml'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: add_instance.rb [options]"
+
+  opts.on('-a', '--account NAME', 'Account name') { |v| options[:account_name] = v }
+  opts.on('-e', '--environment NAME', 'Environment name') { |v| options[:environment_name] = v }
+  opts.on('-n', '--iname NAME', 'Instance name') { |v| options[:instance_name] = v }
+  opts.on('-r', '--irole ROLE', 'Instance role (app, util)') { |v| options[:instance_role] = v }
+  
+end.parse!
+
+# Token comes from '~/.eyrc'
+eyrc = YAML.load_file(File.expand_path("~/.eyrc"))
+
+client = Ey::Core::Client.new(token: eyrc['api_token'])
+
+# Account name as shown in cloud.engineyard.com
+account = client.accounts.first(name: options[:account_name])
+
+# Environment's name
+environment = account.environments.first(name: options[:environment_name])
+
+# Instance's name
+instance_name = options[:instance_name]
+
+puts "Adding app instance #{instance_name} to environment #{environment.name}...."
+
+# TO DO:  read new_server_specs from a file provided as a parameter
+new_server_specs = {
+        :environment     => environment.id,
+        :flavor_id       => "t2_micro",
+        :mnt_volume_size => "10",
+        :name            => instance_name,
+        :role            => options[:instance_role],
+        :volume_size     => "10",
+}
+
+provision_request = client.servers.create!(new_server_specs)
+
+# Provisioning the instance with a timeout of 1200sec.
+# Adjust as necessary depending of the type/role of instance.
+provision_request.ready!(1200)
+
+ap provision_request.attributes
+
+puts "Instance provisioned successfully"
+puts "-------------------"
+
+puts "Waiting for instance #{instance_name} to integrate into the environment #{environment.name}...."
+new_server = provision_request.resource!
+
+new_server.wait_for(1800) { |s| s.state == "running" || s.state == "error" }
+
+if !new_server.enabled? then
+  puts "Adding of instance #{instance_name} into environment #{environment.name} FAILED!!!"
+  puts "Check cloud.engineyard.com for more details"
+  ap new_server.attributes
+  exit
+end
+
+puts "Adding of instance #{instance_name} into environment #{environment.name} SUCCEEDED!!!"
+
+
+

data/examples/boot_env.rb

@@ -1,60 +1,60 @@
-#!/usr/bin/env ruby
-
-# Very basic example of how to boot a given environment from a blueprint
-# For more info visit http://developer.engineyard.com
-
-require 'ey-core'
-require 'optparse'
-require 'yaml'
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: boot_env.rb [options]"
-
-  opts.on('-a', '--account NAME', 'Account name') { |v| options[:account_name] = v }
-  opts.on('-e', '--environment NAME', 'Environment name') { |v| options[:environment_name] = v }
-  opts.on('-b', '--blueprint NAME', 'Blueprint name') { |v| options[:blueprint_name] = v }
-
-end.parse!
-
-# Token comes from '~/.eyrc'
-eyrc = YAML.load_file(File.expand_path("~/.eyrc"))
-
-#client = Ey::Core::Client.new(token: "abcdefghijklmnrstuvwxyz123456789")
-client = Ey::Core::Client.new(token: eyrc['api_token'])
-
-# Account name as shown in cloud.engineyard.com
-account = client.accounts.first(name: options[:account_name])
-
-# Environment's name
-environment = account.environments.first(name: options[:environment_name])
-
-if environment.servers.count > 0 then
-  puts "Environment has instances running, are you sure you want to boot it?"
-  exit
-end
-
-# Get blueprint's name for cloud.engineyard.com
-blueprint = environment.blueprints.first(name: options[:blueprint_name])
-if !blueprint then
-  puts "Could not find the specified blueprint."
-  puts "Check cloud.engineyard.com for more details."
-  exit
-end
-  
-env_options = {"blueprint_id": blueprint.id}
-puts "Booting environment using an specific blueprint...."
-provision_request = environment.boot(env_options)
-
-# Booting the environment instance with a timeout of 1800sec (30mins).
-# Adjust as necessary depending of the size of the environment.
-provision_request.ready!(1800)
-
-puts "-------------------"
-if !provision_request.successful? then
-  puts "Boot environment FAILED!!!"
-  puts "Check cloud.engineyard.com for more details"
-  exit
-end
-
-puts "Boot environment SUCCEDED!!!"
+#!/usr/bin/env ruby
+
+# Very basic example of how to boot a given environment from a blueprint
+# For more info visit http://developer.engineyard.com
+
+require 'ey-core'
+require 'optparse'
+require 'yaml'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: boot_env.rb [options]"
+
+  opts.on('-a', '--account NAME', 'Account name') { |v| options[:account_name] = v }
+  opts.on('-e', '--environment NAME', 'Environment name') { |v| options[:environment_name] = v }
+  opts.on('-b', '--blueprint NAME', 'Blueprint name') { |v| options[:blueprint_name] = v }
+
+end.parse!
+
+# Token comes from '~/.eyrc'
+eyrc = YAML.load_file(File.expand_path("~/.eyrc"))
+
+#client = Ey::Core::Client.new(token: "abcdefghijklmnrstuvwxyz123456789")
+client = Ey::Core::Client.new(token: eyrc['api_token'])
+
+# Account name as shown in cloud.engineyard.com
+account = client.accounts.first(name: options[:account_name])
+
+# Environment's name
+environment = account.environments.first(name: options[:environment_name])
+
+if environment.servers.count > 0 then
+  puts "Environment has instances running, are you sure you want to boot it?"
+  exit
+end
+
+# Get blueprint's name for cloud.engineyard.com
+blueprint = environment.blueprints.first(name: options[:blueprint_name])
+if !blueprint then
+  puts "Could not find the specified blueprint."
+  puts "Check cloud.engineyard.com for more details."
+  exit
+end
+  
+env_options = {"blueprint_id": blueprint.id}
+puts "Booting environment using an specific blueprint...."
+provision_request = environment.boot(env_options)
+
+# Booting the environment instance with a timeout of 1800sec (30mins).
+# Adjust as necessary depending of the size of the environment.
+provision_request.ready!(1800)
+
+puts "-------------------"
+if !provision_request.successful? then
+  puts "Boot environment FAILED!!!"
+  puts "Check cloud.engineyard.com for more details"
+  exit
+end
+
+puts "Boot environment SUCCEDED!!!"

data/examples/console/README.md

@@ -1,14 +1,14 @@
-## Examples and snippets to use with the `ey-core console`
-
-### Getting started
-
-With the _ey-core_ gem comes the `ey-core console` utility which allows to query the CoreAPI interactively.  Below are a series of snippets with commands that will allow actions that normally are done through the EY dashboard, and others which aren't implemented yet but the CoreAPI already supports.
-
-The backend will automatically allow/reject actions based on the api token the console is using.  Upon a successful `ey-core login` said token is written on `$HOME/.ey-core` and picked up from there by the console.  It's a good practice to issue `ey-core whoami` before opening the console to double check that the desired user is logged in.
-
-- Addresses
-   - [List addresses allocated to the account](address.md#list-addresses-on-an-account)
-   - [Provision a new address](address.md#provision-new-address)
-   - [Attach an address to an instance/server](address.md#attach-address-to-instance)
-   - [Detach an address from an instance/server](address.md#detach-address-from-instance)
-
+## Examples and snippets to use with the `ey-core console`
+
+### Getting started
+
+With the _ey-core_ gem comes the `ey-core console` utility which allows to query the CoreAPI interactively.  Below are a series of snippets with commands that will allow actions that normally are done through the EY dashboard, and others which aren't implemented yet but the CoreAPI already supports.
+
+The backend will automatically allow/reject actions based on the api token the console is using.  Upon a successful `ey-core login` said token is written on `$HOME/.ey-core` and picked up from there by the console.  It's a good practice to issue `ey-core whoami` before opening the console to double check that the desired user is logged in.
+
+- Addresses
+   - [List addresses allocated to the account](address.md#list-addresses-on-an-account)
+   - [Provision a new address](address.md#provision-new-address)
+   - [Attach an address to an instance/server](address.md#attach-address-to-instance)
+   - [Detach an address from an instance/server](address.md#detach-address-from-instance)
+

data/examples/console/address.md

@@ -1,51 +1,51 @@
-# IP Addresses
-
-It's advised for each operation to capture the request via an *<operation>_prov_req* variable, which will hold the operation's status.  The snippets below just wait for the request to finish (or timeout in 300sec), but the progress can be tracked issuing `<operation>_prov_req.reload` regularly.
-
--
-
-<a name="list-addresses-on-an-account"></a>
-### List IPs addresses allocated to an account
-
-```
-addresses
-```
-
--
-
-<a name="provision-new-address"></a>
-### Provision a new IP address on the account
-
-```
-new_address_specs = {:provider_id => "23952", :location => "us-east-1"}
-address_prov_req = addresses.create(new_eip_specs)
-address_prov_req.ready!(300)
-```
-
--
-
-<a name="attach-address-to-instance"></a>
-### Attach an address to an instance
-
-```
-addresses
-address = addresses.first(ip_address: "111.222.333.444")
-attach_prov_req = address.attach(servers.first(provisioned_id: "i-aabbccdd"))
-attach_prov_req.ready!(300)
-```
-
--
-
-<a name="detach-address-from-instance"></a>
-### Detach an address from an instance
-
-```
-addresses
-eip = addresses.first(ip_address: "111.222.333.444")
-detach_prov_req = eip.detach
-detach_prov_req.ready!(300)
-```
-
--
-
-
+# IP Addresses
+
+It's advised for each operation to capture the request via an *<operation>_prov_req* variable, which will hold the operation's status.  The snippets below just wait for the request to finish (or timeout in 300sec), but the progress can be tracked issuing `<operation>_prov_req.reload` regularly.
+
+-
+
+<a name="list-addresses-on-an-account"></a>
+### List IPs addresses allocated to an account
+
+```
+addresses
+```
+
+-
+
+<a name="provision-new-address"></a>
+### Provision a new IP address on the account
+
+```
+new_address_specs = {:provider_id => "23952", :location => "us-east-1"}
+address_prov_req = addresses.create(new_eip_specs)
+address_prov_req.ready!(300)
+```
+
+-
+
+<a name="attach-address-to-instance"></a>
+### Attach an address to an instance
+
+```
+addresses
+address = addresses.first(ip_address: "111.222.333.444")
+attach_prov_req = address.attach(servers.first(provisioned_id: "i-aabbccdd"))
+attach_prov_req.ready!(300)
+```
+
+-
+
+<a name="detach-address-from-instance"></a>
+### Detach an address from an instance
+
+```
+addresses
+eip = addresses.first(ip_address: "111.222.333.444")
+detach_prov_req = eip.detach
+detach_prov_req.ready!(300)
+```
+
+-
+
+