Skip to content
This repository has been archived by the owner on Jun 28, 2019. It is now read-only.

Requires aws-sdk-ec2 rather than aws-sdk #79

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cap-ec2.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require 'cap-ec2/version'

Gem::Specification.new do |spec|
spec.name = "cap-ec2"
spec.version = CapEC2::VERSION
spec.version = "1.1.3"
spec.authors = ["Andy Sykes", "Robert Coleman", "Forward3D Developers"]
spec.email = ["[email protected]", "[email protected]", "[email protected]"]
spec.description = %q{Cap-EC2 is used to generate Capistrano namespaces and tasks from Amazon EC2 instance tags, dynamically building the list of servers to be deployed to.}
Expand All @@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rake"

spec.add_dependency "aws-sdk", ">= 2.0"
spec.add_dependency "aws-sdk-ec2"
spec.add_dependency "capistrano", ">= 3.0"
spec.add_dependency "terminal-table"
spec.add_dependency "colorize"
Expand Down
2 changes: 1 addition & 1 deletion lib/cap-ec2/capistrano.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'capistrano/configuration'
require 'aws-sdk'
require 'aws-sdk-ec2'
require 'colorize'
require 'terminal-table'
require 'yaml'
Expand Down
2 changes: 1 addition & 1 deletion lib/cap-ec2/ec2-handler.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'aws-sdk'
require 'aws-sdk-ec2'

module CapEC2
class EC2Handler
Expand Down
4 changes: 2 additions & 2 deletions lib/cap-ec2/utils.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'aws-sdk'
require 'aws-sdk-ec2'

module CapEC2
module Utils
Expand Down Expand Up @@ -55,7 +55,7 @@ def load_config
end

config_location = File.expand_path(fetch(:ec2_config), Dir.pwd) if fetch(:ec2_config)
if config_location && File.exists?(config_location)
if config_location && File.exist?(config_location)
config = YAML.load(ERB.new(File.read(fetch(:ec2_config))))
if config
set :ec2_project_tag, config['project_tag'] if config['project_tag']
Expand Down