taketo 0.1.3 → 0.2.0.alpha

data/lib/taketo/dsl.rb

@@ -6,27 +6,31 @@ module Taketo
     class ConfigError < StandardError; end
 
     class << self
-      def define_scope(scope, *args, &block)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        parent_scopes = args
+      def define_scope(scope, *parent_scopes_and_options, &scope_setup_block)
+        options = parent_scopes_and_options.last.is_a?(Hash) ? parent_scopes_and_options.pop : {}
+        parent_scopes = parent_scopes_and_options
 
-        define_method scope do |*args, &blk|
+        define_method scope do |*args, &scope_block|
           ensure_nesting_allowed!(scope, parent_scopes)
           name = args.shift || options[:default_name] or raise(ArgumentError, "Name not specified")
 
           scope_object = current_scope_object.find(scope, name) { @factory.create(scope, name) }
 
           in_scope(scope, scope_object) do
-            instance_exec(current_scope_object, &block) if block
-            blk.call
+            instance_exec(current_scope_object, &scope_setup_block) if scope_setup_block
+            scope_block.call
           end
         end
+
+        define_method("#{scope}_scope?") do
+          current_scope == scope
+        end
       end
 
       def define_method_in_scope(name, *parent_scopes, &block)
-        define_method name do |*args, &blk|
+        define_method name do |*args, &argument_block|
           ensure_nesting_allowed!(name, parent_scopes)
-          args.push blk if blk
+          args.push argument_block if argument_block
           instance_exec(*args, &block)
         end
       end
@@ -56,8 +60,9 @@ module Taketo
 
     define_scope :project, :config
     define_scope :environment, :project
+    define_scope :group, :environment, :project, :config
 
-    define_scope :server, :environment, :project, :config, :default_name => :default do |s|
+    define_scope :server, :environment, :project, :config, :group, :default_name => :default do |s|
       instance_eval(&s.default_server_config)
     end
 
@@ -75,12 +80,12 @@ module Taketo
     define_method_in_scope(:execute, :command)            { |command|       current_scope_object.command = command                 }
     define_method_in_scope(:desc, :command)               { |description|   current_scope_object.description = description         }
 
-    define_method_in_scope(:default_server_config, :config, :project, :environment) do |blk|
-      current_scope_object.default_server_config = blk
+    define_method_in_scope(:default_server_config, :config, :project, :environment, :group) do |block|
+      current_scope_object.default_server_config = block
     end
 
-    define_method_in_scope(:shared_server_config, :config) do |name, blk|
-      @shared_server_configs.store(name.to_sym, blk)
+    define_method_in_scope(:shared_server_config, :config) do |name, block|
+      @shared_server_configs.store(name.to_sym, block)
     end
 
     define_method_in_scope(:include_shared_server_config, :server) do |*args|
@@ -101,10 +106,6 @@ module Taketo
       current_scope == scope
     end
 
-    [:config, :project, :environment, :server, :command].each do |scope|
-      define_method("#{scope}_scope?") { current_scope == scope }
-    end
-
     def in_scope(scope, new_scope_object)
       parent_scope_object, @current_scope_object = @current_scope_object, new_scope_object
       @scope.push(scope)

data/lib/taketo/group_list_visitor.rb

@@ -0,0 +1,11 @@
+require 'taketo/config_visitor'
+require 'taketo/printer'
+
+module Taketo
+  class GroupListVisitor < SimpleCollector(Constructs::Server)
+    def result
+      @result.map(&:path).join("\n")
+    end
+  end
+end
+

data/lib/taketo/group_resolver.rb

@@ -0,0 +1,12 @@
+require 'taketo/node_resolver'
+
+module Taketo
+
+  class GroupResolver < NodeResolver
+    def nodes
+      super.select { |n| [Taketo::Constructs::Config, Taketo::Constructs::Project, Taketo::Constructs::Environment, Taketo::Constructs::Group].include?(n.class) }
+    end
+  end
+
+end
+

data/lib/taketo/{destination_resolver.rb → node_resolver.rb}

@@ -5,7 +5,7 @@ module Taketo
   class AmbiguousDestinationError < StandardError; end
   class NonExistentDestinationError < StandardError; end
 
-  class DestinationResolver
+  class NodeResolver
     def initialize(config, path)
       @config = config
       if String(path).empty? && !String(config.default_destination).empty?
@@ -15,34 +15,11 @@ module Taketo
       @traverser = ConfigTraverser.new(@config)
     end
 
-    def servers
-      @servers ||= begin
-        collector = SimpleCollector(Taketo::Constructs::Server).new
-        @traverser.visit_depth_first(collector)
-        collector.result
-      end
-    end
-
     def resolve
-      resolve_by_global_alias || resolve_by_path
-    end
-
-    def resolve_by_global_alias
-      unless @path.to_s.empty?
-        servers.select(&:global_alias).detect { |s| s.global_alias == @path.to_s }
-      end
+      resolve_by_path
     end
 
     def resolve_by_path
-      matching_servers = servers.select { |s| s.path =~ /^#@path/ }
-      disambiguate(matching_servers)
-    end
-
-    def get_node
-      resolve_by_global_alias || get_node_by_path
-    end
-
-    def get_node_by_path
       matching_nodes = nodes.select { |n| n.path == @path }
       disambiguate(matching_nodes)
     end
@@ -51,14 +28,14 @@ module Taketo
       @nodes ||= begin
         collector = SimpleCollector(Taketo::Constructs::BaseConstruct).new
         @traverser.visit_depth_first(collector)
-        collector.result
+        collector.result.reject { |n| Taketo::Constructs::Command === n }
       end
     end
 
     def disambiguate(results)
       case results.length
       when 0
-        raise NonExistentDestinationError, "Can't find server for path #@path"
+        raise NonExistentDestinationError, "Can't find such destination: #@path"
       when 1
         results.first
       else
@@ -70,3 +47,4 @@ module Taketo
   end
 end
 
+

data/lib/taketo/server_resolver.rb

@@ -0,0 +1,29 @@
+require 'taketo/node_resolver'
+require 'taketo/constructs/server'
+
+module Taketo
+
+  class ServerResolver < NodeResolver
+    def nodes
+      super.select { |n| Taketo::Constructs::Server === n }
+    end
+    alias :servers :nodes
+
+    def resolve
+      resolve_by_global_alias || resolve_by_path
+    end
+
+    def resolve_by_global_alias
+      unless @path.to_s.empty?
+        servers.select(&:global_alias).detect { |s| s.global_alias == @path.to_s }
+      end
+    end
+
+    def resolve_by_path
+      matching_servers = servers.select { |s| s.path =~ /^#@path/ }
+      disambiguate(matching_servers)
+    end
+  end
+
+end
+

data/spec/acceptance/command_spec.rb

@@ -13,8 +13,9 @@ feature "Run explicit command on remote host" do
     CONFIG
 
     run "taketo --dry-run --command 'TERM=xterm-256color bash'"
-    exit_status.should be_success
     stdout.should == %Q{ssh -t 1.2.3.4 "RAILS_ENV=staging TERM=xterm-256color bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 end
 

data/spec/acceptance/completion_spec.rb

@@ -1,22 +1,39 @@
 require 'acceptance_spec_helper'
 
 feature "Aids completion with matches" do
-  scenario "Show matching servers" do
-    create_config <<-CONFIG
-      project :foo do
+  background { config_exists <<-CONFIG }
+    project :foo do
+      environment :test do
         server :s1 do
           host '1.2.3.4'
         end
       end
+    end
 
-      server :s10 do
-        host '2.3.4.5'
-      end
-    CONFIG
+    server :s10 do
+      host '2.3.4.5'
+    end
+  CONFIG
+
+  scenario "Show servers by default" do
+    run "taketo --matches"
+    stdout.split.should =~ %w(foo:test:s1 s10)
+    stderr.should be_empty
+    exit_status.should be_success
+  end
+
+  scenario "Show scopes for --list" do
+    run "taketo --list --matches"
+    stdout.split.should =~ %w(foo foo:test)
+    stderr.should be_empty
+    exit_status.should be_success
+  end
 
-    run "taketo s1 --matches"
+  scenario "Show all for --view" do
+    run "taketo --view --matches"
+    stdout.split.should =~ %w(foo foo:test foo:test:s1 s10)
+    stderr.should be_empty
     exit_status.should be_success
-    stdout.should =~ %r{(foo:s1 s10|s10 foo:s1)}
   end
 end
 

data/spec/acceptance/config_dsl_spec.rb

@@ -21,8 +21,9 @@ feature "Config DSL" do
     CONFIG
 
     run "taketo slots:staging --dry-run"
-    exit_status.should be_success
     stdout.should =~ %r{ssh -t 1.2.3.4 "(RAILS_ENV=staging FOO=bar|FOO=bar RAILS_ENV=staging) bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   scenario "Command" do
@@ -41,8 +42,9 @@ feature "Config DSL" do
     CONFIG
 
     run "taketo slots:staging --dry-run --command console"
-    exit_status.should be_success
     stdout.should == %Q{ssh -t 1.2.3.4 "cd /var/apps/slots; RAILS_ENV=staging rails c"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   context "Default command" do
@@ -70,14 +72,16 @@ feature "Config DSL" do
 
     scenario "Explicit default command" do
       run "taketo slots:staging:s1 --dry-run"
-      exit_status.should be_success
       stdout.should == %q{ssh -t 1.2.3.4 "RAILS_ENV=staging rails c"}
+      stderr.should be_empty
+      exit_status.should be_success
     end
 
     scenario "Default command defined in config" do
       run "taketo slots:staging:s2 --dry-run"
-      exit_status.should be_success
       stdout.should == %q{ssh -t 2.3.4.5 "RAILS_ENV=staging tmux attach || tmux new-session"}
+      stderr.should be_empty
+      exit_status.should be_success
     end
   end
 
@@ -94,8 +98,9 @@ feature "Config DSL" do
     CONFIG
 
     run "taketo --dry-run"
-    exit_status.should be_success
     stdout.should == %q{ssh -t 1.2.3.4 "cd /var/foo; RAILS_ENV=staging bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   context "Per-Scope default server config" do
@@ -127,13 +132,16 @@ feature "Config DSL" do
 
     scenario "Global default server config" do
       run "taketo shoes --dry-run"
-      exit_status.should be_success
       stdout.should =~ /ssh -t 2\.3\.4\.5 "(RAILS_ENV=production FOO=bar|FOO=bar RAILS_ENV=production) bash"/
+      stderr.should be_empty
+      exit_status.should be_success
     end
 
     scenario "Project default server config" do
       run "taketo slots --dry-run"
       stdout.should =~ /ssh -t 1\.2\.3\.4 "cd .mnt.apps; (RAILS_ENV=staging FOO=bar|FOO=bar RAILS_ENV=staging) bash"/
+      stderr.should be_empty
+      exit_status.should be_success
     end
   end
 
@@ -156,8 +164,9 @@ feature "Config DSL" do
       CONFIG
 
       run "taketo slots:staging:s1 --dry-run"
-      exit_status.should be_success
       stdout.should == %q{ssh -t -p 9999 1.2.3.4 "cd /var/qux; RAILS_ENV=staging bash"}
+      stderr.should be_empty
+      exit_status.should be_success
     end
 
     scenario "Shared server config with arguments" do
@@ -181,8 +190,9 @@ feature "Config DSL" do
       CONFIG
 
       run "taketo slots:staging:s1 --dry-run"
-      exit_status.should be_success
       stdout.should == %q{ssh -t -p 9999 1.2.3.4 "cd /var/qux; RAILS_ENV=staging bash"}
+      stderr.should be_empty
+      exit_status.should be_success
     end
   end
 
@@ -200,8 +210,9 @@ feature "Config DSL" do
     CONFIG
 
     run "taketo --dry-run"
-    exit_status.should be_success
     stdout.should =~ %r{ssh -t 1.2.3.4 "cd /var/apps/slots; (RAILS_ENV=staging FOO=the\\ value|FOO=the\\ value RAILS_ENV=staging) bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   scenario "Unique server alias" do
@@ -221,8 +232,9 @@ feature "Config DSL" do
     CONFIG
 
     run "taketo ss2 --dry-run"
-    exit_status.should be_success
     stdout.should == %q{ssh -t 2.3.4.5 "RAILS_ENV=staging bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   scenario "Default destination" do
@@ -241,8 +253,9 @@ feature "Config DSL" do
     CONFIG
 
     run "taketo --dry-run"
-    exit_status.should be_success
     stdout.should == %Q{ssh -t 2.3.4.5 "RAILS_ENV=staging bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   scenario "ssh identity file" do
@@ -258,8 +271,9 @@ feature "Config DSL" do
     CONFIG
 
     run "taketo --dry-run"
-    exit_status.should be_success
     stdout.should == %q{ssh -t -i /home/gor/.ssh/foo\ bar 2.3.4.5 "RAILS_ENV=staging bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   scenario "server outside project" do
@@ -270,8 +284,55 @@ feature "Config DSL" do
     CONFIG
 
     run "taketo my_server --dry-run"
-    exit_status.should be_success
     stdout.should == %q{ssh -t 1.2.3.4 "bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
+  scenario "group at project level" do
+    create_config <<-CONFIG
+      project :slots do
+        group :frontends do
+          server :s1 do
+            host '1.2.3.4'
+          end
+
+          server :s2 do
+            host '2.3.4.5'
+          end
+        end
+
+        server :s3 do
+          host '3.4.5.6'
+        end
+      end
+    CONFIG
+
+    run "taketo --list slots:frontends"
+    stdout.should == "slots:frontends:s1\nslots:frontends:s2"
+    stderr.should be_empty
+    exit_status.should be_success
+  end
+
+  scenario "groups at config level" do
+    create_config <<-CONFIG
+      group :beer do
+        server do
+          host '1.2.3.4'
+        end
+      end
+
+      project :bars do
+        server do
+          host '3.4.5.6'
+        end
+      end
+    CONFIG
+
+    run "taketo --list beer"
+    stdout.should == "beer:default"
+    stderr.should be_empty
+    exit_status.should be_success
+  end
 end
+

data/spec/acceptance/config_validation_spec.rb

@@ -6,8 +6,8 @@ feature "Config validation" do
     CONFIG
 
     run "taketo"
-    exit_status.should_not be_success
     stderr.should include("There are no servers. Add some to your config (~/.taketo.rc.rb by default)")
+    exit_status.should_not be_success
   end
 
   scenario "Project has no servers" do
@@ -25,8 +25,23 @@ feature "Config validation" do
     CONFIG
 
     run "taketo"
-    exit_status.should_not be_success
     stderr.should include("Project foo: no servers")
+    exit_status.should_not be_success
+  end
+
+  scenario "Group has no servers" do
+    create_config <<-CONFIG
+      server do
+        host '1.2.3.4'
+      end
+
+      group :testgroup do
+      end
+    CONFIG
+
+    run "taketo"
+    stderr.should include("Group testgroup: no servers")
+    exit_status.should_not be_success
   end
 
   scenario "Server has no host defined" do
@@ -40,8 +55,8 @@ feature "Config validation" do
     CONFIG
 
     run "taketo"
-    exit_status.should_not be_success
     stderr.should include("Server foo:bar:default: host is not defined")
+    exit_status.should_not be_success
   end
 
   scenario "Duplicate global server alias" do
@@ -62,8 +77,8 @@ feature "Config validation" do
     CONFIG
 
     run "taketo"
-    exit_status.should_not be_success
     stderr.should include("Server foo:bar:s2: global alias 'a1' has already been taken by server foo:bar:s1")
+    exit_status.should_not be_success
   end
 
   scenario "Command without definition" do
@@ -81,8 +96,8 @@ feature "Config validation" do
     CONFIG
 
     run "taketo"
-    exit_status.should_not be_success
     stderr.should include("Don't know what to execute on command qux")
+    exit_status.should_not be_success
   end
 end
 

data/spec/acceptance/connect_to_server_spec.rb

@@ -19,8 +19,9 @@ feature "connect to server" do
     CONFIG
 
     run "taketo slots:staging:s1 --dry-run"
-    exit_status.should be_success
     stdout.should == %Q{ssh -t deployer@1.2.3.4 "cd /var/apps/slots; RAILS_ENV=staging bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   scenario "ssh to the only server" do
@@ -36,8 +37,9 @@ feature "connect to server" do
     CONFIG
 
     run "taketo --dry-run"
-    exit_status.should be_success
     stdout.should == %Q{ssh -t 1.2.3.4 "cd /var/apps/slots; RAILS_ENV=staging bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 
   scenario "ssh without password" do
@@ -53,8 +55,9 @@ feature "connect to server" do
     CONFIG
 
     run "taketo --dry-run"
-    exit_status.should be_success
     stdout.should == %q{ssh -t -i /home/gor/.ssh/foo\ bar 2.3.4.5 "RAILS_ENV=staging bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 end
 

data/spec/acceptance/error_handling_spec.rb

@@ -18,14 +18,14 @@ feature "Resolve host error handling" do
 
   scenario "Non-existent location" do
     run "taketo slots:staging:qqq --dry-run"
+    stderr.should include("Can't find such destination: slots:staging:qqq")
     exit_status.should_not be_success
-    stderr.should include("Can't find server for path slots:staging:qqq")
   end
 
   scenario "Ambiguous location" do
     run "taketo slots:staging --dry-run"
-    exit_status.should_not be_success
     stderr.should include("There are multiple possible destinations: slots:staging:s1, slots:staging:s2")
+    exit_status.should_not be_success
   end
 end
 

data/spec/acceptance/generate_ssh_config_spec.rb

@@ -25,7 +25,6 @@ feature "Generate SSH config" do
 
   scenario "Generate ssh config" do
     run "taketo --generate-ssh-config"
-    exit_status.should be_success
     stdout.should == <<-SSH_CONFIG.chomp
 Host bar.foo.com
 Hostname bar.foo.com
@@ -39,6 +38,7 @@ Hostname 2.3.4.5
 Host 2.3.4.5
 Hostname 2.3.4.5
     SSH_CONFIG
+    exit_status.should be_success
   end
 end
 

data/spec/acceptance/help_spec.rb

@@ -2,6 +2,8 @@ require 'acceptance_spec_helper'
 
 feature "Global server alias" do
   background { config_exists <<-CONFIG }
+    default_destination 'foo:bar'
+
     project :foo do
       environment :bar do
         server do
@@ -32,7 +34,6 @@ feature "Global server alias" do
 
   scenario "Unique server alias" do
     run "taketo --view"
-    exit_status.should be_success
     stdout.should == <<-CONFIG_OUTLINE.chomp
 
 Project: foo
@@ -55,11 +56,11 @@ Project: baz
         console
         killall - Kill ALL humans
     CONFIG_OUTLINE
+    exit_status.should be_success
   end
 
   scenario "View particular server config" do
     run "taketo foo:bar:default --view"
-    exit_status.should be_success
     stdout.should == <<-CONFIG_OUTLINE.chomp
 Server: default
   Host: 1.2.3.4
@@ -69,6 +70,7 @@ Server: default
   Default command: bash
   Environment: RAILS_ENV=bar
     CONFIG_OUTLINE
+    exit_status.should be_success
   end
 end
 

data/spec/acceptance/location_spec.rb

@@ -14,8 +14,9 @@ feature "Location on remote host" do
     CONFIG
 
     run "taketo slots:staging --dry-run --directory /var/www"
-    exit_status.should be_success
     stdout.should == %q{ssh -t 1.2.3.4 "cd /var/www; RAILS_ENV=staging bash"}
+    stderr.should be_empty
+    exit_status.should be_success
   end
 end
 

data/spec/acceptance_spec_helper.rb

@@ -19,7 +19,7 @@ module AcceptanceSpecDSL
       alias :scenario :it
       alias :xscenario :xit
       alias :given :let
-      alias :given! :let!
+      alias :given! :let
     end
   end
 end

data/spec/lib/taketo/actions_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'taketo/actions'
+
+include Taketo
+
+describe "Actions" do
+  describe ".action_by_name" do
+    it "returns class by name" do
+      Actions[:matches].should == Actions::Matches
+    end
+
+    it "returns LoginAction if action was not found" do
+      Actions[:never_existed_here].should == Actions::Login
+    end
+  end
+end
+