ey_cli 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ey_cli (0.1.1)
+    ey_cli (0.1.2)
       faraday
       faraday-stack
       faraday_middleware

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.1.1'
-  s.date              = '2011-10-16'
+  s.version           = '0.1.2'
+  s.date              = '2011-10-17'
   s.rubyforge_project = 'ey_cli'
 
   ## Make sure your summary is short. The description may be as long
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
     lib/ey_cli/models/account.rb
     lib/ey_cli/models/app.rb
     lib/ey_cli/models/base.rb
+    lib/ey_cli/models/deployment.rb
     lib/ey_cli/models/environment.rb
     lib/ey_cli/options_parser.rb
     lib/ey_cli/smarty_parser.rb

data/history.md

@@ -1,3 +1,8 @@
+## 0.1.2 (10-17-2011)
+
+- Fix git uri label.
+- Show latest deployment information.
+
 ## 0.1.1 (10-16-2011)
 
 - Fix some log messages.

data/lib/ey_cli/commands/create_app.rb

@@ -36,6 +36,8 @@ Options:
        --solo                     A single instance for application and database.
        --stack                    App server stack, either passenger, unicorn or trinidad.
        --no_env                   Prevent to not create a default environment.
+       --app_size                 Size of the app instances.
+       --db_size                  Size of the db instances.
 EOF
       end
 

data/lib/ey_cli/commands/create_env.rb

@@ -28,6 +28,8 @@ Options:
        --db_instances number      Number of database slaves.
        --solo                     A single instance for application and database.
        --stack                    App server stack, either passenger, unicorn or trinidad.
+       --app_size                 Size of the app instances.
+       --db_size                  Size of the db instances.
 EOF
       end
 

data/lib/ey_cli/commands/show.rb

@@ -17,7 +17,7 @@ module EYCli
         %Q{
 #{app.name}:
   - Info:
-     + git repository: #{app.git_repository}}
+     + git repository: #{app.repository_uri}}
       end
 
       def status(app)
@@ -31,9 +31,23 @@ module EYCli
         - stack:       #{env.app_server_stack_name}
         - status:      #{env.instance_status}}
 
+          if deploy = env.last_deployment(app)
+            status << %Q{
+        + last deploy info:
+           - commit:          #{deploy.commit}
+           - created at:      #{deploy.created_at}
+           - finished at:     #{deploy.finished_at}
+           - migrated:        #{deploy.migrate}}
+           if deploy.migrate
+             status << %Q{
+           - migrate command: #{deploy.migrate_command}}
+           end
+          end
+
           if env.instances
             status << %Q{
-        - instances:}
+
+        - Status per instance:}
             env.instances.each do |instance|
               status << %Q{
            + #{instance.role}:

data/lib/ey_cli/git_utils.rb

@@ -6,7 +6,7 @@ module EYCli
 
     def fetch_repository(base)
       config = File.join(base, '.git', 'config')
-      `git config -f #{config} --get 'remote.origin.url'`
+      `git config -f #{config} --get 'remote.origin.url'`.chomp
     end
   end
 end

data/lib/ey_cli/models/base.rb

@@ -27,8 +27,15 @@ module EYCli
       end
 
       def self.resolve_child_path(args)
-        collection_path = base_path % args[0..-1]
-        "#{collection_path}/#{args.last}"
+        "#{collection_path(args[0..-1])}/#{args.last}"
+      end
+
+      def self.child_path(args)
+        resolve_child_path(args)
+      end
+
+      def self.collection_path(args)
+        base_path % args
       end
 
       def self.create(hash)

data/lib/ey_cli/models/deployment.rb

@@ -0,0 +1,18 @@
+module EYCli
+  module Model
+    class Deployment < Base
+      base_path 'apps/%s/environments/%s/deployments'
+
+      def self.deploy_path(app, environment)
+        collection_path([app.id, environment.id]) + '/deploy'
+      end
+
+      def self.last_deployment(app, environment)
+        find(app.id, environment.id, 'last')
+      rescue Faraday::Error::ClientError => e # there is no last deployment if we never deployed the app
+        raise e unless e.response[:status] == 404
+        nil
+      end
+    end
+  end
+end

data/lib/ey_cli/models/environment.rb

@@ -25,7 +25,11 @@ module EYCli
       end
 
       def deploy_path(app)
-        "#{self.class.resolve_child_path([app.id, id])}/deployments/deploy"
+        Deployment.deploy_path(app, self)
+      end
+
+      def last_deployment(app)
+        Deployment.last_deployment(app, self)
       end
     end
   end

data/lib/ey_cli/smarty_parser.rb

@@ -20,6 +20,8 @@ module EYCli
           hash[key] = parse(value, EYCli::Model::App)
         when /environments?/
           hash[key] = parse(value, EYCli::Model::Environment)
+        when /deployments?/
+          hash[key] = parse(value, EYCli::Model::Deployment)
         else
           hash[key] = parse(value, Hashie::Mash)
         end

data/lib/ey_cli.rb

@@ -1,5 +1,5 @@
 module EYCli
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   require 'hashie/mash'
   require 'json'
@@ -16,6 +16,7 @@ module EYCli
   require 'ey_cli/models/base'
   require 'ey_cli/models/account'
   require 'ey_cli/models/app'
+  require 'ey_cli/models/deployment'
   require 'ey_cli/models/environment'
 
   require 'ey_cli/controllers/accounts'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cli
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Calavera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-16 00:00:00 Z
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -224,6 +224,7 @@ files:
 - lib/ey_cli/models/account.rb
 - lib/ey_cli/models/app.rb
 - lib/ey_cli/models/base.rb
+- lib/ey_cli/models/deployment.rb
 - lib/ey_cli/models/environment.rb
 - lib/ey_cli/options_parser.rb
 - lib/ey_cli/smarty_parser.rb