taketo 0.0.10 → 0.1.0

data/Gemfile

@@ -3,7 +3,7 @@ source :rubygems
 group :development do
   gem "rspec", "~> 2.11"
   gem "rake",  "~> 0.9"
-  gem "aruba", "~> 0.4"
   gem 'simplecov', '~> 0.6', :require => false
+  gem 'open4', '~> 1.3'
 end
 

data/Gemfile.lock

@@ -1,44 +1,28 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
-      cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
-    builder (3.0.0)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
     diff-lcs (1.1.3)
-    ffi (1.0.11)
-    gherkin (2.11.0)
-      json (>= 1.4.6)
-    json (1.7.3)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    multi_json (1.3.7)
+    open4 (1.3.0)
+    rake (0.9.5)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    simplecov (0.6.4)
+    rspec-mocks (2.12.0)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.4)
+  open4 (~> 1.3)
   rake (~> 0.9)
   rspec (~> 2.11)
   simplecov (~> 0.6)

data/README.md

@@ -144,6 +144,10 @@ An SSH config file can be generated from taketo config. To do so, run ```taketo
 The Changelog:
 --------------
 
+### 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
+
 ### v0.0.10 (17.11.2012) ###
 * Add ability to generate ssh config
 

data/Rakefile

@@ -12,22 +12,18 @@ end
 
 require 'rake'
 require 'rspec/core/rake_task'
-require 'cucumber'
-require 'cucumber/rake/task'
 
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/lib/**/*_spec.rb'
 end
 
-RSpec::Core::RakeTask.new do |t|
+RSpec::Core::RakeTask.new(:integration_spec) do |t|
   t.pattern = 'spec/integration/**/*_spec.rb'
-  t.name = :integration_spec
 end
 
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --tags ~@wip --format pretty -x"
-  t.fork = false
+RSpec::Core::RakeTask.new(:acceptance_spec) do |t|
+  t.pattern = 'spec/acceptance/**/*_spec.rb'
 end
 
-task :default => [:spec, :features]
+task :default => [:spec, :acceptance_spec]
 

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.1.0

data/bin/taketo

@@ -1,9 +1,5 @@
 #!/usr/bin/env ruby
 
-if ENV["TAKETO_DEV"]
-  $:.unshift(File.expand_path('../../lib', __FILE__))
-end
-
 require 'rubygems'
 
 require 'taketo'
@@ -121,6 +117,10 @@ rescue SystemExit
   # Do nothing
 rescue Exception => e
   STDERR.puts "An error occurred: #{e.message}"
-  raise if options && options[:debug]
+  if options && options[:debug]
+    STDERR.puts e.backtrace
+    raise
+  end
+  exit 1
 end
 

data/lib/taketo/config_printer_visitor.rb

@@ -1,16 +1,14 @@
 require 'taketo/config_visitor'
+require 'taketo/printer'
 
 module Taketo
   class ConfigPrinterVisitor < ConfigVisitor
-    def initialize
-      @indent_level = 0
-      @result = ""
-    end
+    include Printer
 
     visit Config do |config|
       indent(0) do
         if config.has_projects?
-          put "Default destination: #{config.default_destination}" if config.default_destination
+          put_optional "Default destination:", config.default_destination
         else
           put "There are no projects yet..."
         end
@@ -37,9 +35,9 @@ module Taketo
         put "Server: #{server.name}"
         indent do
           put "Host: #{server.host}"
-          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_optional "Port:", server.port
+          put_optional "User:", server.username
+          put_optional "Default location:", server.default_location
           put "Default command: #{server.default_command}"
           put "Environment: " + server.environment_variables.map { |n, v| "#{n}=#{v}" }.join(" ")
           put "Commands:" if server.has_commands?
@@ -50,20 +48,6 @@ module Taketo
     visit Command do |command|
       indent(4) { put command.name.to_s + (" - " + command.description if command.description).to_s }
     end
-
-    def result
-      @result.chomp
-    end
-
-    def indent(level = nil)
-      @first_indent ||= level || @indent_level
-      level ? @indent_level = level - @first_indent : @indent_level += 1
-      yield
-    end
-
-    def put(str = nil)
-      @result += ("  " * @indent_level + str.to_s).rstrip.chomp + "\n"
-    end
   end
 end
 

data/lib/taketo/config_traverser.rb

@@ -3,53 +3,24 @@ require 'forwardable'
 
 module Taketo
   class ConfigTraverser
-    LEVELS = { :config => 1, :project => 2, :environment => 3, :server => 4, :command => 5 }.freeze
-    PLURALS = { :config => :configs, :project => :projects, :environment => :environments, :server => :servers, :command => :commands }.freeze
-
-    class NodeWithPath < SimpleDelegator
-      extend Forwardable
-      def_delegators :__getobj__, :class, :ancestors, :== # avoid ancestry tree troubles
-      
-      attr_reader :path
-
-      def initialize(node, path_string)
-        super(node)
-        @path = path_string.freeze
-      end
-    end
-
     def initialize(root)
       @root = root
     end
 
     def visit_depth_first(visitor)
-      parents = []
-      path_stack = [wrap_node_with_path(parents, @root)]
+      path_stack = [@root]
 
       while path_stack.any?
         node = path_stack.pop
         visitor.visit(node)
 
-        next_level_node_type = LEVELS.respond_to?(:key) ? LEVELS.key(LEVELS[node.node_type] + 1) : LEVELS.index(LEVELS[node.node_type] + 1)
-        if next_level_node_type && node.has_nodes?(PLURALS[next_level_node_type])
-          parents << node
-          node.nodes(PLURALS[next_level_node_type]).reverse_each do |n|
-            n = wrap_node_with_path(parents, n)
-            path_stack.push(n) 
+        node.class.node_types.each do |node_type|
+          node.nodes(node_type).reverse_each do |n|
+            path_stack.push(n)
           end
         end
       end
     end
-
-    private
-
-    def wrap_node_with_path(parents, node)
-      NodeWithPath.new(node, path(parents, node))
-    end
-
-    def path(parents, node)
-      parents.map(&:name).reject(&:nil?).concat([node.name]).join(":")
-    end
   end
 end
 

data/lib/taketo/config_validator.rb

@@ -10,7 +10,7 @@ module Taketo
     end
 
     visit Config do |c|
-      raise ConfigError, "There are no projects. Add some to your config (~/.taketo.rc.rb by default)" unless c.has_projects?
+      raise ConfigError, "There are no servers. Add some to your config (~/.taketo.rc.rb by default)" unless c.has_servers?
     end
 
     visit Project do |p|

data/lib/taketo/config_visitor.rb

@@ -21,8 +21,22 @@ module Taketo
         next unless respond_to?(method_name)
         return send(method_name, obj)
       end
+    end
+  end
+
+  def SimpleCollector(*types)
+    Class.new(ConfigVisitor) do
+      attr_reader :result
 
-      raise "Don't know how to visit #{obj.class}"
+      def initialize
+        @result = []
+      end
+
+      types.each do |t|
+        visit t do |n|
+          @result << n
+        end
+      end
     end
   end
 end

data/lib/taketo/constructs/base_construct.rb

@@ -4,14 +4,17 @@ require 'taketo/associated_nodes'
 module Taketo
   module Constructs
     class BaseConstruct
-
       include AssociatedNodes
-      attr_reader :name, :default_server_config
+
+      attr_accessor :parent
+      attr_reader :name
+      attr_writer :default_server_config
 
       def initialize(name)
         super
         @name = name
         @default_server_config = proc {}
+        @parent = NullConstruct
       end
 
       def node_type
@@ -22,19 +25,40 @@ module Taketo
       ##
       # Override in subclasses if needed
       def parent=(parent)
-        @default_server_config = parent.default_server_config
+        @parent = parent
       end
 
-      def default_server_config=(config)
-        default = @default_server_config
-        @default_server_config = proc { instance_eval(&default); instance_eval(&config) }
+      def parents
+        result = []
+        p = parent
+        while p != NullConstruct
+          result << p
+          p = p.parent
+        end
+        result
+      end
+
+      def path
+        parents.reverse_each.map(&:name).concat([self.name]).reject(&:nil?).join(":")
+      end
+
+      def default_server_config
+        parent_default_server_config = parent.default_server_config
+        own_default_server_config = @default_server_config
+        proc { instance_eval(&parent_default_server_config); instance_eval(&own_default_server_config)}
       end
 
       def qualified_name
         "#{node_type} #{self.name}"
       end
+    end
 
+    class NullConstructClass
+      def default_server_config; proc {}; end
     end
+
+    NullConstruct = NullConstructClass.new
+
   end
 end
 

data/lib/taketo/constructs/config.rb

@@ -5,12 +5,17 @@ module Taketo
   module Constructs
     class Config < BaseConstruct
       has_nodes :projects, :project
+      has_nodes :servers, :server
 
       attr_accessor :default_destination
 
       def initialize(*args)
         super(nil)
       end
+
+      def has_servers?
+        has_nodes?(:servers) || projects.any?(&:has_servers?)
+      end
     end
   end
 end

data/lib/taketo/constructs/environment.rb

@@ -1,4 +1,5 @@
 require 'taketo/constructs/base_construct'
+require 'taketo/constructs/project'
 require 'taketo/support'
 
 module Taketo
@@ -6,14 +7,16 @@ module Taketo
     class Environment < BaseConstruct
       has_nodes :servers, :server
 
-      attr_accessor :project
-
       def initialize(name)
         super(name)
       end
 
       def project_name
-        @project.name if defined? @project
+        if parent.is_a?(Project)
+          parent.name
+        else
+          ""
+        end
       end
     end
   end

data/lib/taketo/constructs/project.rb

@@ -5,10 +5,10 @@ module Taketo
   module Constructs
     class Project < BaseConstruct
       has_nodes :environments, :environment
+      has_nodes :servers, :server
 
-      def append_environment(environment)
-        environment.project = self
-        super
+      def has_servers?
+        has_nodes?(:servers) || environments.any?(&:has_servers?)
       end
     end
   end

data/lib/taketo/constructs/server.rb

@@ -6,7 +6,7 @@ module Taketo
   module Constructs
     class Server < BaseConstruct
       attr_reader :environment_variables
-      attr_accessor :host, :port, :username, :default_location, :default_command, :environment, :global_alias, :identity_file
+      attr_accessor :host, :port, :username, :default_location, :default_command, :global_alias, :identity_file
 
       has_nodes :commands, :command
 
@@ -19,10 +19,9 @@ module Taketo
         @environment_variables.merge!(env_variables)
       end
 
-      def parent=(environment)
-        env(:RAILS_ENV => environment.name.to_s)
-        @environment = environment
+      def parent=(parent)
         super
+        env(:RAILS_ENV => parent.name.to_s) if parent.is_a?(Environment)
       end
 
       def default_command

data/lib/taketo/constructs.rb

@@ -3,4 +3,9 @@ module Taketo
   end
 end
 
-Dir.glob(File.expand_path('../constructs/*.rb', __FILE__)).each { |c| require c }
+require 'taketo/constructs/base_construct'
+require 'taketo/constructs/config'
+require 'taketo/constructs/project'
+require 'taketo/constructs/environment'
+require 'taketo/constructs/server'
+require 'taketo/constructs/command'

data/lib/taketo/destination_resolver.rb

@@ -1,81 +1,66 @@
+require 'taketo/config_visitor'
+require 'taketo/config_traverser'
+
 module Taketo
   class AmbiguousDestinationError < StandardError; end
   class NonExistentDestinationError < StandardError; end
 
   class DestinationResolver
-    class Path
-      PATH = [[:project, :projects], [:environment, :environments], [:server, :servers]].freeze
-
-      class PathNode < Struct.new(:name, :singular, :plural); end
-
-      def initialize(names)
-        names = names.split(":").map(&:to_sym)
-        @path = PATH.each_with_index.map { |n, i| PathNode.new(names[i], *n) }
-      end
-
-      def specified
-        @path.reject { |n| n.name.nil? }
-      end
-
-      def unspecified
-        @path - specified
-      end
-    end
-
     def initialize(config, path)
       @config = config
       if String(path).empty? && !String(config.default_destination).empty?
         path = config.default_destination
       end
-      @path_str = path.dup
-      @path = Path.new(path)
+      @path = path
+      @traverser = ConfigTraverser.new(@config)
     end
 
-    def resolve
-      resolve_by_global_alias || resolve_by_path
-    end
-
-    def get_node(node = @config, remaining_path = @path.specified)
-      handling_failure do
-        return node if remaining_path.empty?
-        next_in_path = remaining_path.shift
-        node = node.find(next_in_path.singular, next_in_path.name)
-        get_node(node, remaining_path)
+    def servers
+      @servers ||= begin
+        collector = SimpleCollector(Taketo::Constructs::Server).new
+        @traverser.visit_depth_first(collector)
+        collector.result
       end
     end
 
-    private
+    def resolve
+      resolve_by_global_alias || resolve_by_path
+    end
 
     def resolve_by_global_alias
-      aliases_and_servers = Hash[servers_with_aliases]
-      aliases_and_servers[@path_str.to_sym] unless String(@path_str).empty?
+      unless @path.to_s.empty?
+        servers.select(&:global_alias).detect { |s| s.global_alias == @path.to_sym }
+      end
     end
 
     def resolve_by_path
-      node = get_node
-      get_only_server(node)
+      matching_servers = servers.select { |s| s.path =~ /^#@path/ }
+      disambiguate(matching_servers)
     end
 
-    def get_only_server(node, remaining_path = @path.unspecified)
-      return node if remaining_path.empty?
-      next_in_path = remaining_path.shift
-      nested_nodes = node.nodes(next_in_path.plural)
-      if nested_nodes.one?
-        node = nested_nodes.first
-        get_only_server(node, remaining_path)
-      else
-        raise AmbiguousDestinationError, "There are multiple #{next_in_path.plural} for #{node.node_type} #{node.name}: #{nested_nodes.map(&:name).join(", ")}"
-      end
+    def get_node
+      matching_nodes = nodes.select { |n| n.path == @path }
+      disambiguate(matching_nodes)
     end
 
-    def handling_failure(message = nil)
-      yield
-    rescue KeyError, NonExistentDestinationError
-      raise NonExistentDestinationError, message || $!.message
+    def nodes
+      @nodes ||= begin
+        collector = SimpleCollector(Taketo::Constructs::BaseConstruct).new
+        @traverser.visit_depth_first(collector)
+        collector.result
+      end
     end
 
-    def servers_with_aliases
-      @config.nodes(:projects).map { |p| p.nodes(:environments).map { |e| e.nodes(:servers).reject { |s| s.global_alias.nil? }.map { |s| [s.global_alias, s] } } }.flatten(2)
+    def disambiguate(results)
+      case results.length
+      when 0
+        raise NonExistentDestinationError, "Can't find server for path #@path"
+      when 1
+        results.first
+      else
+        raise AmbiguousDestinationError,
+          "There are multiple possible destinations: #{results.map(&:path).join(", ")}"
+      end
     end
   end
 end

data/lib/taketo/dsl.rb

@@ -6,9 +6,12 @@ module Taketo
     class ConfigError < StandardError; end
 
     class << self
-      def define_scope(scope, parent_scope, options = {}, &block)
+      def define_scope(scope, *args, &block)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        parent_scopes = args
+
         define_method scope do |*args, &blk|
-          ensure_nesting_allowed!(scope, parent_scope)
+          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) }
@@ -54,7 +57,7 @@ module Taketo
     define_scope :project, :config
     define_scope :environment, :project
 
-    define_scope :server, :environment, :default_name => :default do |s|
+    define_scope :server, :environment, :project, :config, :default_name => :default do |s|
       instance_eval(&s.default_server_config)
     end
 

data/lib/taketo/printer.rb

@@ -0,0 +1,29 @@
+module Taketo
+  module Printer
+    def initialize
+      @indent_level = 0
+      @print_result = ""
+    end
+
+    def result
+      @print_result.chomp
+    end
+
+    private
+
+    def indent(level = nil)
+      @first_indent ||= level || @indent_level
+      level ? @indent_level = level - @first_indent : @indent_level += 1
+      yield
+    end
+
+    def put(str = nil)
+      @print_result += ("  " * @indent_level + str.to_s).rstrip.chomp + "\n"
+    end
+
+    def put_optional(str, value)
+      put "#{str} #{value}" if value
+    end
+  end
+end
+

data/lib/taketo/ssh_config_generator_visitor.rb

@@ -1,36 +1,22 @@
 require 'taketo/config_visitor'
+require 'taketo/printer'
 
 module Taketo
   class SSHConfigGeneratorVisitor < ConfigVisitor
-    def initialize
-      @result = ""
-    end
+    include Printer
 
     visit Server do |server|
-      put "Host #{server.global_alias || server.host}"
+      put_server(server, server.global_alias) unless server.global_alias.to_s.empty?
+      put_server(server, server.host)
+    end
+
+    def put_server(server, host)
+      put "Host #{host}"
       put "Hostname #{server.host}"
       put_optional "Port", server.port
       put_optional "User", server.username
       put_optional "IdentityFile", server.identity_file
       put
     end
-
-    visit Object do |_|
-      # catch all
-    end
-
-    def result
-      @result.chomp
-    end
-
-    private
-
-    def put(str = "")
-      @result += str + "\n"
-    end
-
-    def put_optional(str, value)
-      put "#{str} #{value}" if value
-    end
   end
 end