taketo 0.0.8 → 0.0.9

data/README.md

@@ -33,6 +33,7 @@ puts a config into ```~/.taketo.rc.rb```:
         port 10001
         user "app"
         localtion "/var/app"
+        default_command "tmux attach"
         env :TERM => "xterm-256color"
         command :console do
           execute "rails c"
@@ -44,7 +45,9 @@ puts a config into ```~/.taketo.rc.rb```:
 ```
 
 Then execute ```taketo my_project:staging:server -c console``` to execute the "rails c" with corresponding environment variables set on desired server
-or just ```taketo my_project:staging:server``` to open bash
+or just ```taketo my_project:staging:server``` to attach to tmux on the server
+
+```default_command``` can be either name of defined server command, or explicit command string. Initially, default command is 'bash'.
 
 To have a brief overview of the config run ```taketo [destination] --view```
 
@@ -105,7 +108,7 @@ You can use shared server configs to reduce duplication:
 
       server :s2 do
         host :s2 do
-        include_shared_server_config(:my_staging, :some_other_shared_config => "qux")
+        include_shared_server_configs(:my_staging, :some_other_shared_config => "qux")
       end
     end
   end
@@ -113,9 +116,34 @@ You can use shared server configs to reduce duplication:
 
 This will give you ```console``` commands available both on s1 and s2
 
+Also it's possible to specify default server configuration for any scope (whole config, project or an environment):
+
+```ruby
+  default_server_config do
+    env :TERM => "xterm-256color"
+  end
+
+  project :my_project do
+    default_server_config do # will also include global default server config
+      location '/var/apps'
+    end
+
+    ...
+  end
+
+  project :my_project2 do
+    ...
+  end
+```
+
+Default configs are merged appropriately.
+
 The Changelog:
 --------------
 
+### v0.0.9 (17.11.2012) ###
+* Add default_command server config option
+
 ### v0.0.8 (17.11.2012) ###
 * Add per-config, per-project and per-environment default server config support, i.e.
   ```ruby
@@ -175,8 +203,6 @@ The Changelog:
 TO-DO:
 ------
 
-* Shared server configs without arguments
-* Global server defaults
 * Override default commands per server
 * Define servers outside projects and environments
 * Export SSH config (i.e. for scp)

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/features/commands.feature

@@ -34,9 +34,3 @@ Feature:
       ssh -t 1.2.3.4 "cd /var/apps/slots; RAILS_ENV=staging rails c"
       """
 
-  Scenario: Override default location specified for server
-    When I run taketo --dry-run --directory /var/www slots:staging
-    Then the output should contain
-      """
-      ssh -t 1.2.3.4 "cd /var/www; RAILS_ENV=staging bash"
-      """

data/features/config.feature

@@ -118,3 +118,60 @@ Feature: taketo config
       ssh -t 2.3.4.5 "RAILS_ENV=staging bash"
       """
 
+  Scenario: Override default location specified for server
+    When I have the following config
+      """
+      project :slots do
+        environment :staging do
+          server do
+            location '/var/foo'
+            host "1.2.3.4"
+          end
+        end
+      end
+      """
+    When I run taketo --dry-run --directory /var/www slots:staging
+    Then the output should contain
+      """
+      ssh -t 1.2.3.4 "cd /var/www; RAILS_ENV=staging bash"
+      """
+
+  Scenario: Default server command
+    When I have the following config
+      """
+      project :slots do
+        environment :staging do
+          server do
+            host "1.2.3.4"
+
+            default_command :tmux
+
+            command :tmux do
+              execute "tmux attach || tmux new-session"
+            end
+          end
+        end
+      end
+      """
+    When I run taketo --dry-run slots:staging
+    Then the output should contain
+      """
+      ssh -t 1.2.3.4 "RAILS_ENV=staging tmux attach || tmux new-session"
+      """
+    When I have the following config
+      """
+      project :slots do
+        environment :staging do
+          server do
+            host "1.2.3.4"
+            default_command "do_something"
+          end
+        end
+      end
+      """
+    When I run taketo --dry-run slots:staging
+    Then the output should contain
+      """
+      ssh -t 1.2.3.4 "RAILS_ENV=staging do_something"
+      """
+

data/features/help.feature

@@ -21,8 +21,9 @@ Feature:
       environment :qux do
         server :bart do
           host "2.3.4.5"
+          default_command :console
           command :console do
-            execute "something_to_execute"
+            execute "rails c"
           end
           command :killall do
             execute "killall humans"
@@ -45,14 +46,16 @@ Feature:
             Port: 5678
             User: pivo
             Default location: /var/apps/vodka
+            Default command: bash
             Environment: RAILS_ENV=bar
-              (No commands)
 
       Project: baz
         Environment: qux
           Server: bart
             Host: 2.3.4.5
+            Default command: rails c
             Environment: RAILS_ENV=qux
+            Commands:
               console
               killall - Kill ALL humans
 
@@ -67,7 +70,7 @@ Feature:
         Port: 5678
         User: pivo
         Default location: /var/apps/vodka
+        Default command: bash
         Environment: RAILS_ENV=bar
-          (No commands)
 
       """

data/lib/taketo/config_printer_visitor.rb

@@ -40,8 +40,9 @@ module Taketo
           put "Port: #{server.port}" if server.port
           put "User: #{server.username}" if server.username
           put "Default location: #{server.default_location}" if server.default_location
+          put "Default command: #{server.default_command}"
           put "Environment: " + server.environment_variables.map { |n, v| "#{n}=#{v}" }.join(" ")
-          indent { put "(No commands)" unless server.has_commands? }
+          put "Commands:" if server.has_commands?
         end
       end
     end

data/lib/taketo/constructs/command.rb

@@ -13,13 +13,17 @@ module Taketo
       end
 
       def self.explicit_command(command_string)
-        new(:explicit_command).tap { |cmd| cmd.command = command_string }
+        new(:explicit_command).tap { |cmd| cmd.command = command_string.to_s }
       end
 
       def render(server, options = {})
         %Q[#{location(server, options)} #{environment_variables(server)} #{command}].strip.squeeze(" ")
       end
 
+      def to_s
+        command.to_s
+      end
+
       private
 
       def location(server, options = {})

data/lib/taketo/constructs/server.rb

@@ -26,7 +26,11 @@ module Taketo
       end
 
       def default_command
-        defined?(@default_command) ? @default_command : Command.default
+        if defined? @default_command
+          find_command(@default_command) || Command.explicit_command(@default_command)
+        else
+          Command.default
+        end
       end
     end
   end

data/lib/taketo/dsl.rb

@@ -68,6 +68,7 @@ module Taketo
     define_method_in_scope(:global_alias,:server)         { |alias_name|    current_scope_object.global_alias = alias_name         }
     define_method_in_scope(:env, :server)                 { |env|           current_scope_object.env(env)                          }
     define_method_in_scope(:identity_file, :server)       { |identity_file| current_scope_object.identity_file = identity_file     }
+    define_method_in_scope(:default_command, :server)     { |command|       current_scope_object.default_command = command         }
     define_method_in_scope(:execute, :command)            { |command|       current_scope_object.command = command                 }
     define_method_in_scope(:desc, :command)               { |description|   current_scope_object.description = description         }
 

data/spec/lib/taketo/config_printer_visitor_spec.rb

@@ -29,6 +29,7 @@ describe "ConfigPrinterVisitor" do
            :port => 8000,
            :username => "bob",
            :default_location => "/var/app",
+           :default_command => "tmux",
            :environment_variables => { :FOO => "bar", :BOO => "baz" })
     end
 
@@ -41,13 +42,20 @@ describe "ConfigPrinterVisitor" do
   Port: 8000
   User: bob
   Default location: /var/app
+  Default command: tmux
   Environment: (FOO=bar BOO=baz|BOO=baz FOO=bar)])
     end
 
-    it "renders appropriate message if there are no commands" do
+    it "does not renders commands section header if there are no commands defined" do
       server.stub(:has_commands? => false)
       printer.visit_server(server)
-      expect(printer.result).to include("(No commands)")
+      expect(printer.result).not_to match(/commands/i)
+    end
+
+    it "renders commands if defined" do
+      server.stub(:has_commands? => true)
+      printer.visit_server(server)
+      expect(printer.result).to include("Commands:")
     end
   end
 

data/spec/lib/taketo/constructs/command_spec.rb

@@ -38,5 +38,10 @@ describe "Command" do
       expect(Taketo::Constructs::Command.explicit_command("qq").command).to eq("qq")
     end
   end
+
+  specify "#to_s returns just command" do
+    command.command = "hello_there"
+    expect(command.to_s).to eq("hello_there")
+  end
 end
 

data/spec/lib/taketo/constructs/server_spec.rb

@@ -15,7 +15,6 @@ describe "Server" do
   it { should have_accessor(:port) }
   it { should have_accessor(:username) }
   it { should have_accessor(:default_location) }
-  it { should have_accessor(:default_command) }
   it { should have_accessor(:global_alias) }
   it { should have_accessor(:identity_file) }
 
@@ -25,9 +24,27 @@ describe "Server" do
     end
   end
 
-  it "has default command" do
-    Taketo::Constructs::Command.should_receive(:default).and_return(:qux)
-    expect(server.default_command).to eq(:qux)
+  describe "#default_command" do
+    before(:each) { stub_const("Taketo::Constructs::Command", Class.new) }
+
+    it "returns Command.default if nothing defined" do
+      Taketo::Constructs::Command.should_receive(:default).and_return(:qux)
+      expect(server.default_command).to eq(:qux)
+    end
+
+    it "returns existing defined command if default command name is set" do
+      command = stub(:Command, :name => :foo)
+      server.commands << command
+      server.default_command = :foo
+      expect(server.default_command).to eq(command)
+    end
+
+    it "returns explicit command if default command not found by name" do
+      command = stub(:Command)
+      Taketo::Constructs::Command.should_receive(:explicit_command).with("tmux attach || tmux new-session").and_return(command)
+      server.default_command = "tmux attach || tmux new-session"
+      expect(server.default_command).to eq(command)
+    end
   end
 
   describe "#parent=" do

data/spec/lib/taketo/dsl_spec.rb

@@ -219,6 +219,10 @@ describe "DSL" do
       it_behaves_like "a scoped method", :identity_file, :server, :identity_file=, "/home/gor/.ssh/qqq"
     end
 
+    describe "#default_command" do
+      it_behaves_like "a scoped method", :default_command, :server, :default_command=, :tmux
+    end
+
     describe "#command" do
       it_behaves_like "a scope", :command, :server
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taketo
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -75,14 +75,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-description: ! "    The aim of the project is to aid quick access to often used servers
-  for web-developers\n\n    With config similar to the following, one could make his
-  life easier:\n\n    project :my_project do\n      environment :staging do\n        server
-  do\n          host \"192.168.1.1\"\n          location \"/var/www/prj1\"\n          env
-  :TERM => \"xterm-256color\"\n        end\n      end\n    end\n\n    put it in ~/.taketo.rc.rb
-  (or wherever you want using --config)\n    and `taketo my_project` effectively becomes:\n
-  \   `ssh -t 192.168.1.1 \"cd /var/www/prj1; TERM=xterm-256color RAILS_ENV=staging
-  bash\"`\n\n    see http://github.com/v-yarotsky/taketo for additional instructions\n"
+description: ! "    Taketo is an utility to aid quick access to often used servers
+  for web-developers.\n    Taketo uses a config written in ruby using light DSL.\n
+  \   See http://github.com/v-yarotsky/taketo for additional instructions\n"
 email: vladimir.yarotksy@gmail.com
 executables:
 - taketo