ey_cli 0.2.0 → 0.2.1

data/Rakefile

@@ -64,7 +64,7 @@ end
 
 desc "release a new version of ey_cli, tag the version and push the gem"
 task :release => :build do
-  unless `git branch` =~ /^\* master$/
+  unless `git branch --no-color` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
   end

data/bin/ey_cli

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$:.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'ey_cli'
 
 EYCli::CLI.new.run(ARGV)

data/ey_cli.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'ey_cli'
-  s.version           = '0.2.0'
-  s.date              = '2011-11-18'
+  s.version           = '0.2.1'
+  s.date              = '2012-04-09'
   s.rubyforge_project = 'ey_cli'
 
   ## Make sure your summary is short. The description may be as long
@@ -49,14 +49,14 @@ Gem::Specification.new do |s|
   s.add_dependency('hashie')
   s.add_dependency('json')
   s.add_dependency('multi_json')
-  s.add_dependency('slop')
+  s.add_dependency('slop', '2.4.4')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency('rake', '~> 0.9')
   s.add_development_dependency('rspec')
   s.add_development_dependency('webmock')
-  s.add_development_dependency('fakefs')
+  s.add_development_dependency('fakefs', '~> 0.3.2')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -64,7 +64,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     LICENSE
     README.md
     Rakefile

data/history.md

@@ -1,3 +1,9 @@
+## 0.2.1 (12-04-09)
+
+- Force slop 2.4.4; as slow 3.0+ introduces a regression
+- Pass environment options thru correctly when booting an environment
+- 'show' displays IP address
+
 ## 0.2.0 (11-18-2011)
 
 - Allow to deploy Node.js applications

data/lib/ey_cli/api.rb

@@ -7,7 +7,7 @@ module EYCli
     attr_reader :endpoint
 
     def initialize(endpoint = nil)
-      @endpoint = endpoint || 'https://cloud.engineyard.com/api/v2/'
+      @endpoint = endpoint || ENV['EY_ENDPOINT'] || 'https://cloud.engineyard.com/api/v2/'
     end
 
     def read_token(file = nil)

data/lib/ey_cli/cli.rb

@@ -1,7 +1,7 @@
 module EYCli
   class CLI
     def run(args)
-      name = args.shift.downcase
+      name = (args.shift || 'help').downcase
       command = EYCli.command_manager[name]
       unless command
         EYCli.term.say <<-EOF

data/lib/ey_cli/command_manager.rb

@@ -16,6 +16,7 @@ module EYCli
       command_name = name.to_sym
       return nil unless commands.key?(command_name)
       commands[command_name] = load_command(command_name) unless commands[command_name]
+      commands[command_name]
     end
 
     def load_command(name)

data/lib/ey_cli/commands/create_app.rb

@@ -11,8 +11,13 @@ module EYCli
         account = @accounts.fetch_account(options.delete(:account))
         app = @apps.create(account, Dir.pwd, options)
         if app
-          @envs.create(app, CreateEnv::EnvParser.new.fill_create_env_options(options)) unless options[:no_env]
-          EYCli.term.say("You can run now 'ey_cli show #{app.name}' to know the status of the application")
+          env_parser = CreateEnv::EnvParser.new.fill_create_env_options(options)
+          if options[:no_env]
+            EYCli.term.say("Skipping creation of environment...")
+          else
+            environment = @envs.create(app, env_parser)
+            EYCli.term.say("You can run now 'ey_cli show #{app.name}' to know the status of the application")
+          end
         end
         app
       end
@@ -61,7 +66,7 @@ EOF
             on :db_instances, true, :as => :integer
             #on :util_instances, true, :as => :integer # FIXME: utils instances are handled differently
             on :solo, false, :default => false
-            on :stack, true, :matches => /passenger|unicorn|trinidad/
+            on :stack, true, :matches => /passenger|unicorn|puma|thin|trinidad/
             on :no_env, false, :default => false
             on :app_size, true do |size|
               CreateEnv::EnvParser.check_instance_size(size)

data/lib/ey_cli/commands/create_env.rb

@@ -8,9 +8,11 @@ module EYCli
       end
 
       def invoke
-        account = @accounts.fetch_account(options[:account]) if options[:account]
-        app = @apps.fetch_app(account, {:app_name => options[:app]})
-        @environments.create(app, options_parser.fill_create_env_options(options))
+        account     = @accounts.fetch_account(options[:account]) if options[:account]
+        app         = @apps.fetch_app(account, {:app_name => options[:app]})
+        env_options = options_parser.fill_create_env_options(options)
+        
+        @environments.create(app, env_options)
       end
 
       def help
@@ -51,7 +53,7 @@ EOF
             on :db_instances, true, :as => :integer
             #on :util_instances, true, :as => :integer # FIXME: utils instances are handled differently
             on :solo, false, :default => false
-            on :stack, true, :matches => /passenger|unicorn|trinidad/
+            on :stack, true, :matches => /passenger|unicorn|puma|thin|trinidad/
             on :app_size, true do |size|
               EnvParser.check_instance_size(size)
             end
@@ -61,7 +63,7 @@ EOF
           end
           opts.to_hash
         end
-
+        
         def self.check_instance_size(size)
           sizes_list = [
             'm1.small', 'm1.large', 'm1.xlarge',
@@ -76,12 +78,18 @@ EOF
         end
 
         def fill_create_env_options(options)
-          opts = {:name => (options[:env_name] || options[:name]), :framework_env => options[:framework_env]}
-          if options[:stack]
-            case options[:stack].to_sym
-            when :passenger then options[:stack] = 'nginx_passenger3'
-            when :unicorn   then options[:stack] = 'nginx_unicorn'
-            when :trinidad  then options[:ruby_version] = 'JRuby'
+          opts = {
+            :name          => (options[:env_name] || options[:name]), 
+            :framework_env => options[:framework_env],
+            :stack         => options[:stack],
+            :ruby_version  => options[:ruby_version]
+          }
+          
+          if opts[:stack]
+            case opts[:stack].to_sym
+            when :passenger then opts[:stack] = 'nginx_passenger3'
+            when :unicorn   then opts[:stack] = 'nginx_unicorn'
+            when :trinidad  then opts[:ruby_version] = 'JRuby'
             end
           end
 
@@ -99,7 +107,7 @@ EOF
           else
             opts[:cluster_configuration] = {:configuration => 'cluster'}
           end
-
+          
           opts
         end
       end

data/lib/ey_cli/commands/show.rb

@@ -27,9 +27,10 @@ module EYCli
         app.environments.each do |env|
           status << %Q{
      + #{env.name}:
-        - environment: #{env.framework_env}
-        - stack:       #{env.app_server_stack_name}
-        - status:      #{env.instance_status}}
+        - environment:  #{env.framework_env}
+        - IP address:   #{env.load_balancer_ip_address}
+        - stack:        #{env.app_server_stack_name}
+        - status:       #{env.instance_status}}
 
           if deploy = env.last_deployment(app)
             status << %Q{

data/lib/ey_cli.rb

@@ -1,5 +1,5 @@
 module EYCli
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 
   require 'hashie/mash'
   require 'json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ey_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2157796660 !ruby/object:Gem::Requirement
+  requirement: &70186120190660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157796660
+  version_requirements: *70186120190660
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &2157796080 !ruby/object:Gem::Requirement
+  requirement: &70186120190120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157796080
+  version_requirements: *70186120190120
 - !ruby/object:Gem::Dependency
   name: faraday-stack
-  requirement: &2157795540 !ruby/object:Gem::Requirement
+  requirement: &70186120189660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157795540
+  version_requirements: *70186120189660
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2157794940 !ruby/object:Gem::Requirement
+  requirement: &70186120189200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157794940
+  version_requirements: *70186120189200
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2157794220 !ruby/object:Gem::Requirement
+  requirement: &70186120188660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157794220
+  version_requirements: *70186120188660
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157793500 !ruby/object:Gem::Requirement
+  requirement: &70186120188120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157793500
+  version_requirements: *70186120188120
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2157793040 !ruby/object:Gem::Requirement
+  requirement: &70186120187540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,21 +87,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157793040
+  version_requirements: *70186120187540
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &2157792580 !ruby/object:Gem::Requirement
+  requirement: &70186120186680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2157792580
+  version_requirements: *70186120186680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157791700 !ruby/object:Gem::Requirement
+  requirement: &70186120185640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2157791700
+  version_requirements: *70186120185640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157790760 !ruby/object:Gem::Requirement
+  requirement: &70186120184440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157790760
+  version_requirements: *70186120184440
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2157789700 !ruby/object:Gem::Requirement
+  requirement: &70186120183980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,18 +131,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157789700
+  version_requirements: *70186120183980
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2157789200 !ruby/object:Gem::Requirement
+  requirement: &70186120199620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
   type: :development
   prerelease: false
-  version_requirements: *2157789200
+  version_requirements: *70186120199620
 description: More user friendly CLI for Engine Yard cloud. Use undocumented APIs
 email: david.calavera@gmail.com
 executables:
@@ -153,7 +153,6 @@ extra_rdoc_files:
 - LICENSE
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -213,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1484874266169118057
+      hash: -1956038389853527985
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ey_cli
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 2
 summary: More user friendly CLI for Engine Yard cloud

data/Gemfile.lock

@@ -1,58 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ey_cli (0.2.0)
-      faraday
-      faraday-stack
-      faraday_middleware
-      hashie
-      highline
-      json
-      multi_json
-      slop
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.6)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    fakefs (0.3.2)
-    faraday (0.7.4)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    faraday-stack (0.1.3)
-      faraday (~> 0.6)
-    faraday_middleware (0.7.0)
-      faraday (~> 0.7.3)
-    hashie (1.0.0)
-    highline (1.6.2)
-    json (1.6.1)
-    multi_json (1.0.3)
-    multipart-post (1.1.3)
-    rack (1.3.5)
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    slop (2.1.0)
-    webmock (1.7.6)
-      addressable (~> 2.2, > 2.2.5)
-      crack (>= 0.1.7)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  ey_cli!
-  fakefs
-  rake (~> 0.9)
-  rspec
-  webmock