engineyard 0.5.3 → 0.5.4

data/lib/engineyard/vendor/thor/task.rb

@@ -0,0 +1,102 @@
+class Thor
+  class Task < Struct.new(:name, :description, :long_description, :usage, :options)
+    FILE_REGEXP = /^#{Regexp.escape(File.dirname(__FILE__))}/
+
+    # A dynamic task that handles method missing scenarios.
+    class Dynamic < Task
+      def initialize(name, options=nil)
+        super(name.to_s, "A dynamically-generated task", name.to_s, name.to_s, options)
+      end
+
+      def run(instance, args=[])
+        if (instance.methods & [name.to_s, name.to_sym]).empty?
+          super
+        else
+          instance.class.handle_no_task_error(name)
+        end
+      end
+    end
+
+    def initialize(name, description, long_description, usage, options=nil)
+      super(name.to_s, description, long_description, usage, options || {})
+    end
+
+    def initialize_copy(other) #:nodoc:
+      super(other)
+      self.options = other.options.dup if other.options
+    end
+
+    # By default, a task invokes a method in the thor class. You can change this
+    # implementation to create custom tasks.
+    def run(instance, args=[])
+      public_method?(instance) ?
+        instance.send(name, *args) : instance.class.handle_no_task_error(name)
+    rescue ArgumentError => e
+      handle_argument_error?(instance, e, caller) ?
+        instance.class.handle_argument_error(self, e) : (raise e)
+    rescue NoMethodError => e
+      handle_no_method_error?(instance, e, caller) ?
+        instance.class.handle_no_task_error(name) : (raise e)
+    end
+
+    # Returns the formatted usage by injecting given required arguments
+    # and required options into the given usage.
+    def formatted_usage(klass, namespace=true)
+      namespace = klass.namespace unless namespace == false
+
+      # Add namespace
+      formatted = if namespace
+        "#{namespace.gsub(/^(default|thor:runner:)/,'')}:"
+      else
+        ""
+      end
+
+      # Add usage with required arguments
+      formatted << if klass && !klass.arguments.empty?
+        usage.to_s.gsub(/^#{name}/) do |match|
+          match << " " << klass.arguments.map{ |a| a.usage }.compact.join(' ')
+        end
+      else
+        usage.to_s
+      end
+
+      # Add required options
+      formatted << " #{required_options}"
+
+      # Strip and go!
+      formatted.strip
+    end
+
+    protected
+
+      def not_debugging?(instance)
+        !(instance.class.respond_to?(:debugging) && instance.class.debugging)
+      end
+
+      def required_options
+        @required_options ||= options.map{ |_, o| o.usage if o.required? }.compact.sort.join(" ")
+      end
+
+      # Given a target, checks if this class name is not a private/protected method.
+      def public_method?(instance) #:nodoc:
+        collection = instance.private_methods + instance.protected_methods
+        (collection & [name.to_s, name.to_sym]).empty?
+      end
+
+      def sans_backtrace(backtrace, caller) #:nodoc:
+        saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP }
+        saned -= caller
+      end
+
+      def handle_argument_error?(instance, error, caller)
+        not_debugging?(instance) && error.message =~ /wrong number of arguments/ &&
+          sans_backtrace(error.backtrace, caller).empty?
+      end
+
+      def handle_no_method_error?(instance, error, caller)
+        not_debugging?(instance) &&
+          error.message =~ /^undefined method `#{name}' for #{Regexp.escape(instance.to_s)}$/
+      end
+
+  end
+end

data/lib/engineyard/vendor/thor/util.rb

@@ -0,0 +1,229 @@
+require 'rbconfig'
+
+class Thor
+  module Sandbox #:nodoc:
+  end
+
+  # This module holds several utilities:
+  #
+  # 1) Methods to convert thor namespaces to constants and vice-versa.
+  #
+  #   Thor::Utils.namespace_from_thor_class(Foo::Bar::Baz) #=> "foo:bar:baz"
+  #
+  # 2) Loading thor files and sandboxing:
+  #
+  #   Thor::Utils.load_thorfile("~/.thor/foo")
+  #
+  module Util
+
+    # Receives a namespace and search for it in the Thor::Base subclasses.
+    #
+    # ==== Parameters
+    # namespace<String>:: The namespace to search for.
+    #
+    def self.find_by_namespace(namespace)
+      namespace = "default#{namespace}" if namespace.empty? || namespace =~ /^:/
+      Thor::Base.subclasses.find { |klass| klass.namespace == namespace }
+    end
+
+    # Receives a constant and converts it to a Thor namespace. Since Thor tasks
+    # can be added to a sandbox, this method is also responsable for removing
+    # the sandbox namespace.
+    #
+    # This method should not be used in general because it's used to deal with
+    # older versions of Thor. On current versions, if you need to get the
+    # namespace from a class, just call namespace on it.
+    #
+    # ==== Parameters
+    # constant<Object>:: The constant to be converted to the thor path.
+    #
+    # ==== Returns
+    # String:: If we receive Foo::Bar::Baz it returns "foo:bar:baz"
+    #
+    def self.namespace_from_thor_class(constant)
+      constant = constant.to_s.gsub(/^Thor::Sandbox::/, "")
+      constant = snake_case(constant).squeeze(":")
+      constant
+    end
+
+    # Given the contents, evaluate it inside the sandbox and returns the
+    # namespaces defined in the sandbox.
+    #
+    # ==== Parameters
+    # contents<String>
+    #
+    # ==== Returns
+    # Array[Object]
+    #
+    def self.namespaces_in_content(contents, file=__FILE__)
+      old_constants = Thor::Base.subclasses.dup
+      Thor::Base.subclasses.clear
+
+      load_thorfile(file, contents)
+
+      new_constants = Thor::Base.subclasses.dup
+      Thor::Base.subclasses.replace(old_constants)
+
+      new_constants.map!{ |c| c.namespace }
+      new_constants.compact!
+      new_constants
+    end
+
+    # Returns the thor classes declared inside the given class.
+    #
+    def self.thor_classes_in(klass)
+      stringfied_constants = klass.constants.map { |c| c.to_s }
+      Thor::Base.subclasses.select do |subclass|
+        next unless subclass.name
+        stringfied_constants.include?(subclass.name.gsub("#{klass.name}::", ''))
+      end
+    end
+
+    # Receives a string and convert it to snake case. SnakeCase returns snake_case.
+    #
+    # ==== Parameters
+    # String
+    #
+    # ==== Returns
+    # String
+    #
+    def self.snake_case(str)
+      return str.downcase if str =~ /^[A-Z_]+$/
+      str.gsub(/\B[A-Z]/, '_\&').squeeze('_') =~ /_*(.*)/
+      return $+.downcase
+    end
+
+    # Receives a string and convert it to camel case. camel_case returns CamelCase.
+    #
+    # ==== Parameters
+    # String
+    #
+    # ==== Returns
+    # String
+    #
+    def self.camel_case(str)
+      return str if str !~ /_/ && str =~ /[A-Z]+.*/
+      str.split('_').map { |i| i.capitalize }.join
+    end
+
+    # Receives a namespace and tries to retrieve a Thor or Thor::Group class
+    # from it. It first searches for a class using the all the given namespace,
+    # if it's not found, removes the highest entry and searches for the class
+    # again. If found, returns the highest entry as the class name.
+    #
+    # ==== Examples
+    #
+    #   class Foo::Bar < Thor
+    #     def baz
+    #     end
+    #   end
+    #
+    #   class Baz::Foo < Thor::Group
+    #   end
+    #
+    #   Thor::Util.namespace_to_thor_class("foo:bar")     #=> Foo::Bar, nil # will invoke default task
+    #   Thor::Util.namespace_to_thor_class("baz:foo")     #=> Baz::Foo, nil
+    #   Thor::Util.namespace_to_thor_class("foo:bar:baz") #=> Foo::Bar, "baz"
+    #
+    # ==== Parameters
+    # namespace<String>
+    #
+    def self.find_class_and_task_by_namespace(namespace, fallback = true)
+      if namespace.include?(?:) # look for a namespaced task
+        pieces = namespace.split(":")
+        task   = pieces.pop
+        klass  = Thor::Util.find_by_namespace(pieces.join(":"))
+      end
+      unless klass # look for a Thor::Group with the right name
+        klass, task = Thor::Util.find_by_namespace(namespace), nil
+      end
+      if !klass && fallback # try a task in the default namespace
+        task = namespace
+        klass = Thor::Util.find_by_namespace('')
+      end
+      return klass, task
+    end
+
+    # Receives a path and load the thor file in the path. The file is evaluated
+    # inside the sandbox to avoid namespacing conflicts.
+    #
+    def self.load_thorfile(path, content=nil, debug=false)
+      content ||= File.binread(path)
+
+      begin
+        Thor::Sandbox.class_eval(content, path)
+      rescue Exception => e
+        $stderr.puts "WARNING: unable to load thorfile #{path.inspect}: #{e.message}"
+        if debug
+          $stderr.puts *e.backtrace
+        else
+          $stderr.puts e.backtrace.first
+        end
+      end
+    end
+
+    def self.user_home
+      @@user_home ||= if ENV["HOME"]
+        ENV["HOME"]
+      elsif ENV["USERPROFILE"]
+        ENV["USERPROFILE"]
+      elsif ENV["HOMEDRIVE"] && ENV["HOMEPATH"]
+        File.join(ENV["HOMEDRIVE"], ENV["HOMEPATH"])
+      elsif ENV["APPDATA"]
+        ENV["APPDATA"]
+      else
+        begin
+          File.expand_path("~")
+        rescue
+          if File::ALT_SEPARATOR
+            "C:/"
+          else
+            "/"
+          end
+        end
+      end
+    end
+
+    # Returns the root where thor files are located, dependending on the OS.
+    #
+    def self.thor_root
+      File.join(user_home, ".thor").gsub(/\\/, '/')
+    end
+
+    # Returns the files in the thor root. On Windows thor_root will be something
+    # like this:
+    #
+    #   C:\Documents and Settings\james\.thor
+    #
+    # If we don't #gsub the \ character, Dir.glob will fail.
+    #
+    def self.thor_root_glob
+      files = Dir["#{thor_root}/*"]
+
+      files.map! do |file|
+        File.directory?(file) ? File.join(file, "main.thor") : file
+      end
+    end
+
+    # Where to look for Thor files.
+    #
+    def self.globs_for(path)
+      ["#{path}/Thorfile", "#{path}/*.thor", "#{path}/tasks/*.thor", "#{path}/lib/tasks/*.thor"]
+    end
+
+    # Return the path to the ruby interpreter taking into account multiple
+    # installations and windows extensions.
+    #
+    def self.ruby_command
+      @ruby_command ||= begin
+        ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+        ruby << Config::CONFIG['EXEEXT']
+
+        # escape string in case path to ruby executable contain spaces.
+        ruby.sub!(/.*\s.*/m, '"\&"')
+        ruby
+      end
+    end
+
+  end
+end

data/lib/engineyard/vendor/thor/version.rb

@@ -0,0 +1,3 @@
+class Thor
+  VERSION = "0.13.6".freeze
+end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/spec/ey/deploy_spec.rb

@@ -197,9 +197,17 @@ describe "ey deploy" do
   context "specifying the application" do
     before(:all) do
       api_scenario "one app, one environment"
+    end
+
+    before(:each) do
+      @_deploy_spec_start_dir = Dir.getwd
       Dir.chdir(File.expand_path("~"))
     end
 
+    after(:each) do
+      Dir.chdir(@_deploy_spec_start_dir)
+    end
+
     it "allows you to specify an app when not in a directory" do
       ey "deploy --app rails232app --ref master"
       @ssh_commands.last.should match(/--app rails232app/)
@@ -212,10 +220,21 @@ describe "ey deploy" do
     end
   end
 
-  it "passes along the repository URL to eysd" do
-    api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
-    ey "deploy"
-    @ssh_commands.last.should =~ /--repo user@git.host:path\/to\/repo.git/
-  end
+  context "sending necessary information" do
+    use_git_repo("deploy test")
 
+    before(:all) do
+      api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
+      ey "deploy"
+      @deploy_command = @ssh_commands.find {|c| c =~ /eysd deploy/ }
+    end
+
+    it "passes along the repository URL to eysd" do
+      @deploy_command.should =~ /--repo user@git.host:path\/to\/repo.git/
+    end
+
+    it "passes along the web server stack to eysd" do
+      @deploy_command.should =~ /--stack nginx_mongrel/
+    end
+  end
 end

data/spec/ey/ey_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "ey" do
   context "run without arguments" do
     it "prints usage information" do
-      ey.should include("Commands:")
+      ey.should include("Usage:")
     end
   end
 

data/spec/ey/rollback_spec.rb

@@ -17,4 +17,11 @@ describe "ey rollback" do
 
   it_should_behave_like "it takes an environment name"
   it_should_behave_like "it invokes eysd"
+
+  it "passes along the web server stack to eysd" do
+    api_scenario "one app, one environment"
+    ey "rollback"
+    @ssh_commands.last.should =~ /--stack nginx_mongrel/
+  end
+
 end

data/spec/spec_helper.rb

@@ -14,6 +14,19 @@ end
 require 'fakeweb'
 require 'fakeweb_matcher'
 require 'fakefs/safe'
+module FakeFS
+  def self.activated?
+    Object.const_get(:Dir) == FakeFS::Dir
+  end
+
+  def self.without
+    was_on = activated?
+    deactivate!
+    yield
+    activate! if was_on
+  end
+end
+
 require 'json'
 
 # Engineyard gem

data/spec/support/git_repo.rb

@@ -3,19 +3,22 @@ module Spec
     def define_git_repo(name, &setup)
       # EY's ivars don't get cleared between examples, so we can keep
       # a git repo around longer (and thus make our tests faster)
-      EY.define_git_repo(name, &setup)
+      FakeFS.without { EY.define_git_repo(name, &setup) }
     end
 
     def use_git_repo(repo_name)
-      before(:each) do
-        @_original_wd ||= []
-        @_original_wd << Dir.getwd
-        Dir.chdir(EY.git_repo_dir(repo_name))
+      before(:all) do
+        FakeFS.without do
+          @_original_wd ||= []
+          @_original_wd << Dir.getwd
+          Dir.chdir(EY.git_repo_dir(repo_name))
+        end
       end
 
-      after(:each) do
-        Dir.chdir(@_original_wd.pop)
+      after(:all) do
+        FakeFS.without { Dir.chdir(@_original_wd.pop) }
       end
     end
+
   end
 end