taketo 0.1.0 → 0.1.1

data/README.md

@@ -141,9 +141,15 @@ Default configs are merged appropriately.
 
 An SSH config file can be generated from taketo config. To do so, run ```taketo --generate-ssh-config```.
 
+
+Taketo has autocompletion support for ZSH; completion file can be found at: scripts/zsh/completion/_taketo
+
 The Changelog:
 --------------
 
+### v0.1.1 (04.12.2012) ###
+* Add basic autocompletion support for ZSH, see scripts/zsh/completion
+
 ### v0.1.0 (04.12.2012) ###
 * Servers can now be outside projects and environments (userful for standalone servers)
 * SSH config is being generated both for hostnames and global aliases
@@ -213,6 +219,4 @@ The Changelog:
 TO-DO:
 ------
 
-* Define servers outside projects and environments
-* Destination completion
 * Command completion

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/taketo

@@ -6,6 +6,7 @@ require 'taketo'
 require 'taketo/constructs_factory'
 require 'taketo/commands'
 require 'taketo/destination_resolver'
+require 'taketo/destination_matcher'
 require 'optparse'
 
 Signal.trap("SIGINT") do
@@ -61,6 +62,10 @@ def parse_options
       options[:debug] = d
     end
 
+    opts.on("--matches") do |m|
+      options[:matches] = m
+    end
+
   end.parse!
 
   options
@@ -96,7 +101,9 @@ begin
   destination_path = ARGV.shift.to_s
   resolver         = DestinationResolver.new(config, destination_path)
 
-  if options.delete(:view)
+  if options.delete(:matches)
+    puts DestinationMatcher.new(resolver.servers).matches.join(" ")
+  elsif options.delete(:view)
     node = resolver.get_node
     traverser = ConfigTraverser.new(node)
     config_printer = ConfigPrinterVisitor.new

data/lib/taketo/config_validator.rb

@@ -14,7 +14,7 @@ module Taketo
     end
 
     visit Project do |p|
-      raise ConfigError, "Project #{p.path}: no environments" unless p.has_environments?
+      raise ConfigError, "Project #{p.path}: no servers" unless p.has_servers?
     end
 
     visit Environment do |e|

data/lib/taketo/destination_matcher.rb

@@ -0,0 +1,22 @@
+module Taketo
+  class DestinationMatcher
+    def initialize(servers)
+      @servers = servers
+    end
+
+    def matches
+      (path_matches + global_alias_matches).uniq
+    end
+
+    private
+
+    def path_matches
+      @servers.map(&:path)
+    end
+
+    def global_alias_matches
+      @servers.map(&:global_alias).map(&:to_s).reject(&:empty?)
+    end
+  end
+end
+

data/lib/taketo/destination_resolver.rb

@@ -58,7 +58,8 @@ module Taketo
       when 1
         results.first
       else
-        raise AmbiguousDestinationError,
+        exact_match = results.detect { |n| n.path == @path }
+        exact_match or raise AmbiguousDestinationError,
           "There are multiple possible destinations: #{results.map(&:path).join(", ")}"
       end
     end

data/spec/acceptance/completion_spec.rb

@@ -0,0 +1,23 @@
+require 'acceptance_spec_helper'
+
+feature "Aids completion with matches" do
+  scenario "Show matching servers" do
+    create_config <<-CONFIG
+      project :foo do
+        server :s1 do
+          host '1.2.3.4'
+        end
+      end
+
+      server :s10 do
+        host '2.3.4.5'
+      end
+    CONFIG
+
+    run "taketo s1 --matches"
+    exit_status.should be_success
+    stdout.should =~ %r{(foo:s1 s10|s10 foo:s1)}
+  end
+end
+
+

data/spec/acceptance/config_validation_spec.rb

@@ -10,7 +10,7 @@ feature "Config validation" do
     stderr.should include("There are no servers. Add some to your config (~/.taketo.rc.rb by default)")
   end
 
-  scenario "Project has no environments" do
+  scenario "Project has no servers" do
     create_config <<-CONFIG
       project :foo do
       end
@@ -26,28 +26,7 @@ feature "Config validation" do
 
     run "taketo"
     exit_status.should_not be_success
-    stderr.should include("Project foo: no environments")
-  end
-
-  scenario "Environment has no servers" do
-    create_config <<-CONFIG
-      project :foo do
-        environment :bar do
-        end
-      end
-
-      project :bar do
-        environment :baz do
-          server :qux do
-            host '1.2.3.4'
-          end
-        end
-      end
-    CONFIG
-
-    run "taketo"
-    exit_status.should_not be_success
-    stderr.should include("Environment foo:bar: no servers")
+    stderr.should include("Project foo: no servers")
   end
 
   scenario "Server has no host defined" do

data/spec/lib/taketo/config_validator_spec.rb

@@ -18,22 +18,15 @@ end
 describe "ConfigValidator::ConfigValidatorVisitor" do
   subject(:visitor) { ConfigValidator::ConfigValidatorVisitor.new }
 
-  it "requires config to have servers" do
-    config = stub(:Config, :has_servers? => false)
-    error_message = /no servers/
-    expect { visitor.visit_config(config) }.to raise_error ConfigError, error_message
-
-    config.stub(:has_servers? => true)
-    expect { visitor.visit_config(config) }.not_to raise_error ConfigError, error_message
-  end
-
-  it "requires projects to have environments" do
-    project = stub(:Project, :has_environments? => false, :path => "my_project")
-    error_message = /my_project: no environments/
-    expect { visitor.visit_project(project) }.to raise_error ConfigError, error_message
-
-    project.stub(:has_environments? => true)
-    expect { visitor.visit_project(project) }.not_to raise_error ConfigError, error_message
+  { :Config => nil, :Project => "my_project" }.each do |node_type, path|
+    it "requires #{node_type} to have servers" do
+      node = stub(node_type, :has_servers? => false, :path => path)
+      error_message = /#{path ? path + ": " : ""}no servers/
+      expect { visitor.send("visit_#{node_type.to_s.downcase}", node) }.to raise_error ConfigError, error_message
+
+      node.stub(:has_servers? => true)
+      expect { visitor.send("visit_#{node_type.to_s.downcase}", node) }.not_to raise_error ConfigError, error_message
+    end
   end
 
   it "requires environments to have servers" do

data/spec/lib/taketo/destination_matcher_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'support/helpers/construct_spec_helper'
+require 'taketo/support/named_nodes_collection'
+require 'taketo/destination_matcher'
+
+describe "DestinationMatcher" do
+  include ConstructsFixtures
+
+  let!(:server1) { s = server(:s1); s.global_alias = :foo_server_alias; s }
+  let!(:environment1) { environment(:bar, :servers => server1) }
+  let!(:project1) { project(:foo, :environments => environment1) }
+
+  let!(:server2) { server(:s2) }
+
+  let!(:config) { create_config(:projects => project1, :servers => server2) }
+
+  subject(:matcher) { Taketo::DestinationMatcher.new([server1, server2]) }
+
+  describe "#matches" do
+    it "returns list of all server paths" do
+      expect(matcher.matches).to match_array(%w(foo_server_alias foo:bar:s1 s2))
+    end
+  end
+
+end
+

data/spec/lib/taketo/destination_resolver_spec.rb

@@ -21,7 +21,9 @@ describe "DestinationResolver" do
   let(:environment3) { environment(:corge, :servers => [server3, server4]) }
   let(:project3) { project(:quux, :environments => environment3) }
 
-  let(:environment4) { environment(:garply, :servers => [server(:s5), server(:s6)]) }
+  let(:server5) { server(:s5) }
+  let(:server6) { server(:s6) }
+  let(:environment4) { environment(:garply, :servers => [server5, server6]) }
   let(:environment5) { environment(:waldo, :servers => server(:s7)) }
   let(:project4) { project(:grault, :environments => [environment4, environment5]) }
 
@@ -127,6 +129,15 @@ describe "DestinationResolver" do
         expect(resolver(config, "").resolve).to eq(server1)
       end
     end
+
+    context "when there is exact match and partial match" do
+      it "resolves to exact match" do
+        s1 = server(:server1)
+        s10 = server(:server10)
+        config = create_config(:servers => [s1, s10])
+        expect(resolver(config, "server1").resolve).to eq(s1)
+      end
+    end
   end
 
   context "when there is global matching server alias" do

metadata

@@ -1,91 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: taketo
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Vladimir Yarotsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id004
-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"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+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: 
+executables:
 - taketo
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/taketo
 - lib/taketo/associated_nodes.rb
 - lib/taketo/commands/ssh_command.rb
@@ -102,6 +100,7 @@ files:
 - lib/taketo/constructs/server.rb
 - lib/taketo/constructs.rb
 - lib/taketo/constructs_factory.rb
+- lib/taketo/destination_matcher.rb
 - lib/taketo/destination_resolver.rb
 - lib/taketo/dsl.rb
 - lib/taketo/printer.rb
@@ -111,6 +110,7 @@ files:
 - lib/taketo/support.rb
 - lib/taketo.rb
 - spec/acceptance/command_spec.rb
+- spec/acceptance/completion_spec.rb
 - spec/acceptance/config_dsl_spec.rb
 - spec/acceptance/config_validation_spec.rb
 - spec/acceptance/connect_to_server_spec.rb
@@ -133,6 +133,7 @@ files:
 - spec/lib/taketo/constructs/project_spec.rb
 - spec/lib/taketo/constructs/server_spec.rb
 - spec/lib/taketo/constructs_factory_spec.rb
+- spec/lib/taketo/destination_matcher_spec.rb
 - spec/lib/taketo/destination_resolver_spec.rb
 - spec/lib/taketo/dsl_spec.rb
 - spec/lib/taketo/ssh_config_generator_visitor_spec.rb
@@ -150,40 +151,29 @@ files:
 - README.md
 - VERSION
 homepage: http://github.com/v-yarotsky/taketo
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A tiny helper utility to make access to servers eaiser for different projects and environments
+summary: A tiny helper utility to make access to servers eaiser for different projects
+  and environments
 test_files: []
-
-has_rdoc: