engineyard 1.7.0.pre2 → 2.0.0.pre1

data/lib/engineyard/cli.rb

@@ -3,6 +3,7 @@ require 'engineyard/error'
 require 'engineyard/thor'
 require 'engineyard/deploy_config'
 require 'engineyard/serverside_runner'
+require 'launchy'
 
 module EY
   class CLI < EY::Thor
@@ -146,7 +147,7 @@ module EY
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
       deployment = app_env.last_deployment
       if deployment
-        ui.say "# Status of last deployment of #{app_env.to_hierarchy_str}:"
+        ui.say "# Status of last deployment of #{app_env.hierarchy_name}:"
         ui.say "#"
         ui.show_deployment(deployment)
         ui.say "#"
@@ -177,10 +178,9 @@ module EY
       :desc => "Show environments matching environment name"
     def environments
       if options[:all] && options[:simple]
-        # just put each env
-        puts api.environments.map {|env| env.name}
+        ui.print_simple_envs api.environments
       elsif options[:all]
-        ui.print_envs(api.apps, config.default_environment, options[:simple], config.endpoint)
+        ui.print_envs(api.apps)
       else
         remotes = nil
         if options[:app] == ''
@@ -203,14 +203,17 @@ module EY
 
         apps = resolver.matches.map { |app_env| app_env.app }.uniq
 
-        if apps.size > 1
-          message = "This git repo matches multiple Applications in EY Cloud:\n"
-          apps.each { |app| message << "\t#{app.name}\n" }
-          message << "The following environments contain those applications:\n\n"
-          ui.warn(message)
+        if options[:simple]
+          if apps.size > 1
+            message = "# This app matches multiple Applications in EY Cloud:\n"
+            apps.each { |app| message << "#\t#{app.name}\n" }
+            message << "# The following environments contain those applications:\n\n"
+            ui.warn(message)
+          end
+          ui.print_simple_envs(apps.map{ |app| app.environments }.flatten)
+        else
+          ui.print_envs(apps, config.default_environment)
         end
-
-        ui.print_envs(apps, config.default_environment, options[:simple], config.endpoint)
       end
     end
     map "envs" => :environments
@@ -263,7 +266,7 @@ module EY
       env_config    = config.environment_config(app_env.environment_name)
       deploy_config = EY::DeployConfig.new(options, env_config, repo, ui)
 
-      ui.info("Rolling back #{app_env.to_hierarchy_str}")
+      ui.info("Rolling back #{app_env.hierarchy_name}")
 
       runner = serverside_runner(app_env, deploy_config.verbose)
       runner.rollback do |args|

data/lib/engineyard/cli/recipes.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module EY
   class CLI
     class Recipes < EY::Thor
@@ -66,10 +68,25 @@ module EY
             environment.upload_recipes_at_path(filename)
             ui.say "Recipes file #{filename} uploaded successfully for #{environment.name}"
           else
-            environment.tar_and_upload_recipes_in_cookbooks_dir
+            path = cookbooks_dir_archive_path
+            environment.upload_recipes_at_path(path)
             ui.say "Recipes in cookbooks/ uploaded successfully for #{environment.name}"
           end
         end
+
+        def cookbooks_dir_archive_path
+          unless FileTest.exist?("cookbooks")
+            raise EY::Error, "Could not find chef recipes. Please run from the root of your recipes repo."
+          end
+
+          recipes_file = Tempfile.new("recipes")
+          cmd = "tar czf '#{recipes_file.path}' cookbooks/"
+
+          unless system(cmd)
+            raise EY::Error, "Could not archive recipes.\nCommand `#{cmd}` exited with an error."
+          end
+          recipes_file.path
+        end
       end
 
       desc "download [--environment ENVIRONMENT]",
@@ -87,9 +104,20 @@ module EY
         :required => true, :default => '',
         :desc => "Name of the account in which the environment can be found"
       def download
+        if File.exist?('cookbooks')
+          raise EY::Error, "Cannot download recipes, cookbooks directory already exists."
+        end
+
         environment = fetch_environment(options[:environment], options[:account])
-        environment.download_recipes
-        ui.say "Recipes downloaded successfully for #{environment.name}"
+
+        recipes = environment.download_recipes
+        cmd = "tar xzf '#{recipes.path}' cookbooks"
+
+        if system(cmd)
+          ui.say "Recipes downloaded successfully for #{environment.name}"
+        else
+          raise EY::Error, "Could not unarchive recipes.\nCommand `#{cmd}` exited with an error."
+        end
       end
 
     end

data/lib/engineyard/cli/ui.rb

@@ -127,30 +127,32 @@ module EY
         return ''
       end
 
-      def print_envs(apps, default_env_name = nil, simple = false, endpoint = 'https://cloud.engineyard.com')
-        if simple
-          envs = apps.map{ |app| app.environments.to_a }
-          puts envs.flatten.map{|env| env.name }.uniq
-        else
-          apps.each do |app|
-            puts "#{app.account.name}/#{app.name}"
-            if app.environments.any?
-              app.environments.each do |env|
-                short_name = env.shorten_name_for(app)
-
-                icount = env.instances_count
-                iname = (icount == 1) ? "instance" : "instances"
-
-                default_text = env.name == default_env_name ? " [default]" : ""
-
-                puts "  #{short_name}#{default_text} (#{icount} #{iname})"
-              end
-            else
-              puts "  (This application is not in any environments; you can make one at #{endpoint})"
+      def print_simple_envs(envs)
+        puts envs.map{|env| env.name }.uniq.sort
+      end
+
+      def print_envs(apps, default_env_name = nil)
+        apps.sort_by {|app| "#{app.account.name}/#{app.name}" }.each do |app|
+          puts "#{app.account.name}/#{app.name}"
+          if app.environments.any?
+            app.environments.sort_by {|env| env.name }.each do |env|
+              icount = env.instances_count
+              iname = case icount
+                      when 0 then "(stopped)"
+                      when 1 then "1 instance"
+                      else "#{icount} instances"
+                      end
+
+              name = env.name == default_env_name ? "#{env.name} (default)" : env.name
+              framework_env = env.framework_env && "[#{env.framework_env.center(12)}]"
+
+              puts "    #{name.ljust(30)} #{framework_env}  #{iname}"
             end
-
-            puts ""
+          else
+            puts "    (No environments)"
           end
+
+          puts ""
         end
       end
 

data/lib/engineyard/config.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'yaml'
+require 'pathname'
 require 'engineyard/error'
 
 module EY
@@ -60,8 +61,44 @@ module EY
       environments[environment_name] ||= {}
       environments[environment_name][key] = value
       ensure_path
+      comments = ey_yml_comments
       @path.open('w') do |f|
-        YAML.dump(@config, f)
+        f.puts comments
+        f.puts YAML.dump(@config)
+      end
+    end
+
+    EY_YML_HINTS = <<-HINTS
+# ey.yml supports many deploy configuration options when committed in an
+# application's repository.
+#
+# Valid locations: REPO_ROOT/ey.yml or REPO_ROOT/config/ey.yml.
+#
+# Examples options:
+#
+# environments:
+#   YOUR_ENVIRONMENT_NAME: # All options pertain only to the named environment
+#     migrate: true                           # Default --migrate choice for ey deploy
+#     migration_command: 'rake migrate'       # Default migrate command to run when migrations are enabled
+#     branch: default_deploy_branch           # Branch/ref to be deployed by default during ey deploy
+#     bundle_without: development test        # The string to pass to bundle install --without ''
+#     maintenance_on_migrate: true            # Enable maintenance page during migrate action (use with caution) (default: true)
+#     maintenance_on_restart: false           # Enable maintanence page during every deploy (default: false for unicorn & passenger)
+#     ignore_database_adapter_warning: false  # Hide the warning shown when the Gemfile does not contain a recognized database adapter (mongodb for example)
+#     your_own_custom_key: 'any attribute you put in ey.yml is available in deploy hooks'
+#
+# Further information available here:
+# https://support.cloud.engineyard.com/entries/20996661-customize-your-deployment-on-engine-yard-cloud
+#
+# NOTE: Please commit this file into your git repository.
+#
+    HINTS
+
+    def ey_yml_comments
+      if @path.exist?
+        existing = @path.readlines.grep(/^#/).join("\n")
+      else
+        EY_YML_HINTS
       end
     end
 
@@ -70,8 +107,11 @@ module EY
       unless EY::Repo.exist?
         raise "Not in application directory. Unable to save configuration."
       end
-      @path = Pathname.new('config/ey.yml')
-      @path.dirname.mkpath
+      if Pathname.new('config').exist?
+        @path = Pathname.new('config/ey.yml')
+      else
+        @path = Pathname.new('ey.yml')
+      end
       @path
     end
 

data/lib/engineyard/deploy_config/migrate.rb

@@ -101,12 +101,12 @@ module EY
           command_from_interaction
         end
         ui.say "#{env_config.path}: migrate settings saved for #{env_config.name}."
-        ui.say  "It's a good idea to git commit #{env_config.path} with these new changes."
+        ui.info "It's a good idea to git commit #{env_config.path} with these new changes."
         true
       rescue Timeout::Error
         @perform = nil
         @command = nil
-        ui.error "Timeout when waiting for input. This is not a terminal."
+        ui.error "Timeout when waiting for input. Maybe this is not a terminal?"
         ui.error "ey deploy no longer migrates when no default is set in ey.yml."
         ui.error "Run interactively for step-by-step ey.yml migration setup."
         return false

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.7.0.pre2'
+  VERSION = '2.0.0.pre1'
 end

data/spec/ey/deploy_spec.rb

@@ -107,43 +107,57 @@ describe "ey deploy" do
       @ssh_commands.last.should =~ %r{/usr/local/ey_resin/ruby/bin/engineyard-serverside}
     end
 
-    context "without migrate sepecified interactively reads migration command" do
-      after  { File.unlink 'config/ey.yml' }
+    context "without migrate sepecified, interactively reads migration command" do
+      def clean_ey_yml
+        File.unlink 'ey.yml' if File.exist?('ey.yml')
+        FileUtils.rm_r 'config' if FileTest.exist?('config')
+      end
+
+      before { clean_ey_yml }
+      after  { clean_ey_yml }
 
-      it "defaults to yes, and then rake db:migrate" do
-        File.exist?('config/ey.yml').should be_false
+      it "defaults to yes, and then rake db:migrate (and installs to config/ey.yml if config/ exists already)" do
+        ey_yml = Pathname.new('config/ey.yml')
+        File.exist?('ey.yml').should be_false
+        ey_yml.dirname.mkpath
+        ey_yml.should_not be_exist
         ey(%w[deploy]) do |input|
           input.puts('')
           input.puts('')
         end
         @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
         @ssh_commands.last.should =~ /--migrate 'rake db:migrate'/
-        env_conf = read_yaml('config/ey.yml')['environments']['giblets']
+        File.exist?('ey.yml').should be_false
+        ey_yml.should be_exist
+        env_conf = read_yaml(ey_yml.to_s)['environments']['giblets']
         env_conf['migrate'].should == true
         env_conf['migration_command'].should == 'rake db:migrate'
       end
 
       it "accepts new commands" do
-        File.exist?('config/ey.yml').should be_false
+        File.exist?('ey.yml').should be_false
+        FileTest.exist?('config').should be_false
         ey(%w[deploy], :hide_err => true) do |input|
           input.puts("y")
           input.puts("ruby migrate")
         end
         @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
         @ssh_commands.last.should =~ /--migrate 'ruby migrate'/
-        env_conf = read_yaml('config/ey.yml')['environments']['giblets']
+        File.exist?('ey.yml').should be_true
+        env_conf = read_yaml('ey.yml')['environments']['giblets']
         env_conf['migrate'].should == true
         env_conf['migration_command'].should == 'ruby migrate'
       end
 
       it "doesn't ask for the command if you say no" do
-        File.exist?('config/ey.yml').should be_false
+        File.exist?('ey.yml').should be_false
         ey(%w[deploy], :hide_err => true) do |input|
           input.puts("no")
         end
         @ssh_commands.last.should =~ /engineyard-serverside.*deploy/
         @ssh_commands.last.should_not =~ /--migrate/
-        read_yaml('config/ey.yml')['environments']['giblets']['migrate'].should == false
+        File.exist?('ey.yml').should be_true
+        read_yaml('ey.yml')['environments']['giblets']['migrate'].should == false
       end
     end
 

data/spec/ey/list_environments_spec.rb

@@ -114,7 +114,6 @@ describe "ey environments with an ambiguous git repo" do
 
   it "lists environments from all apps using the git repo" do
     fast_ey %w[environments]
-    @out.should =~ /git repo matches multiple/i
     @out.should include("giblets")
     @out.should include("keycollector_production")
   end

data/spec/ey/status_spec.rb

@@ -9,12 +9,15 @@ describe "ey environments" do
   end
 
   it "outputs the status of the deployment" do
+    ey %w[deploy -e giblets --ref HEAD --no-migrate]
     ey %w[status -e giblets]
     @out.should =~ /Application:\s+rails232app/
     @out.should =~ /Environment:\s+giblets/
     @out.should =~ /Ref:\s+HEAD/
-    @out.should =~ /Resolved Ref:\s+HEAD/
-    @out.should =~ /Deployed by:\s+User Name/
+    @out.should =~ /Resolved Ref:\s+resolved-HEAD/
+    @out.should =~ /Commit:\s+[a-f0-9]{40}/
+    @out.should =~ /Migrate:\s+false/
+    @out.should =~ /Deployed by:\s+One App Many Envs/
     @out.should =~ /Started at:/
     @out.should =~ /Finished at:/
     @out.should =~ /This deployment was successful/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 1.7.0.pre2
+  version: 2.0.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre2
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.pre2
+        version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +308,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/ey
-- lib/engineyard/cli/#recipes.rb#
 - lib/engineyard/cli/api.rb
 - lib/engineyard/cli/recipes.rb
 - lib/engineyard/cli/ui.rb
@@ -413,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud

data/lib/engineyard/cli/#recipes.rb#

@@ -1,32 +0,0 @@
-module EY
-  class CLI
-    class Recipes < EY::Thor
-X1gx1GGG      desc "recipes apply [ENVIRONMENT]", <<-DESC
-Run uploaded chef recipes on specified environment.
-
-This is similar to '#{banner_base} rebuild' except Engine Yard's main
-configuration step is skipped.
-      DESC
-
-      def apply(name = nil)
-        environment = fetch_environment(name)
-        environment.run_custom_recipes
-        EY.ui.say "Uploaded recipes started for #{environment.name}"
-      end
-
-      desc "recipes upload [ENVIRONMENT]", <<-DESC
-Upload custom chef recipes to specified environment.
-
-The current directory should contain a subdirectory named "cookbooks" to be
-uploaded.
-      DESC
-
-      def upload(name = nil)
-        environment = fetch_environment(name)
-        environment.upload_recipes
-        EY.ui.say "Recipes uploaded successfully for #{environment.name}"
-      end
-    end
-  end
-
-end