automux 0.2.0 → 0.3.0

data/README.md

@@ -164,10 +164,28 @@ windows:
 name: test
 windows:
   - name: git
-    panes: git pull '-r:' master
+    panes: git pull origin '-r:'
 ```
 
-* Note: The option needs to be surounded by quotes. It makes Automux's job easier.
+#### Dynamic root values using opts.
+
+**root** defaults to the current directory. One may use an opt to achieve dynamic assignment.
+
+```yaml
+name: test
+root: '-r:'
+windows:
+  - panes: pwd
+```
+
+`automux test -r projects` will change the directory to *projects* before starting Tmux.
+
+`automux test` will use the current directory.
+
+#### Note
+
+* Since the opts are derived from the blueprint, the blueprint name needs to precede the opts as seen in the above commands.
+* The option needs to be surounded by quotes. It makes Automux's job easier.
 
 ## Custom defined window indexes
 
@@ -209,7 +227,7 @@ Here the indexing will start from 2 onwards.
 
 > What would Tmux do?
 
-Automux is built on top of an ruby API for Tmux. Instead of providing a custom key for every possible Tmux option, its approach is to provide direct access to the session/window objects. This gives way for higher levels of customizations like allowing end users to add their own session/window methods and using them in the blueprints to letting them define their own recipes for logic. The following sections will look at some these approaches.
+Automux is built on top of an ruby API for Tmux. Instead of providing a custom key for every possible Tmux option, its approach is to provide direct access to the session/window objects. This gives way for higher levels of customizations like allowing end users to add their own session/window methods and using them in the blueprints or letting them define their own recipes for logic. The following sections will look at some these approaches.
 
 ### Hooks with ERB
 
@@ -287,7 +305,7 @@ cd <%= root %>
 
   - if window.has_panes?
     - window.panes.each do |pane|
-      = create_pane if pane.index > 0
+      = split_window if pane.index > 0
       = send_keys(window, pane.command)
     - end
   - end
@@ -296,13 +314,15 @@ cd <%= root %>
 = attach_session
 ```
 
-Its a simpler form of ERB much like [HAML](https://github.com/haml/haml) without indentation. The ERB is evaluated with session's context. Hence all methods defined for session are available here. The default recipe comes from the gem and cannot be overwritten. Custom recipes can be run like so:
+Its a simpler form of ERB much like [HAML](https://github.com/haml/haml) without indentation. The ERB is evaluated with session's context. Hence all methods defined for session are available here. Custom recipes can be run like so:
 
 ```sh
 $ automux default custom_recipe
 ```
 _Here default is the default blueprint name._
 
+* Note: The default recipe comes from the Gem and cannot be overwritten. Running `automux default default` will invoke the recipe defined in the Gem instead of any user defined default. The primary reason for this approach is not the burden end users with the necessity to update their default recipe in future releases.
+
 ## Bash Autocompletion
 
 Currently blueprint names can be autocompleted. A dedicated autocompletion shell script is in the pipeline. For now add the following to your `~/.bashrc` to get autocompletion for blueprint names.

data/bin/automux

@@ -3,20 +3,12 @@
 lib_path = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)
 
+ENV['AUTOMUX_ENV'] ||= 'production'
 require 'automux'
 
-args = ARGV.take_while { |argument| argument.match(/^\w/) }
+probable_class_name = ARGV[0].to_s.to_sym.capitalize
 
-case args[0]
-when 'setup'
-  Automux::Controller::Setup.new.clone_defaults
-when 'blueprint'
-  params = { blueprint_name: args[2], clone_name: args[3] }
-  Automux::Controller::Blueprints.new(params).public_send(args[1])
-else
-  params = {
-    blueprint_name: args[0] || 'default',
-    recipe_name:    args[1] || 'default'
-  }
-  Automux::Controller::Recipes.new(params).automate
-end
+class_name = Automux::Redirector.constants.grep(probable_class_name).first
+class_name ||= :Default
+
+Automux::Redirector.const_get(class_name).new(ARGV).redirect

data/data/automux/recipes/default.sh.erb

@@ -23,7 +23,7 @@ cd <%= root %>
     - end
 
     - window.panes.each do |pane|
-      = create_pane if pane.index > 0
+      = split_window if pane.index > 0
       = send_keys(window, pane.command)
     - end
 

data/features/custom_recipes.feature

@@ -11,7 +11,7 @@ Feature: User using a custom recipe
         windows:
           - panes: vim
         """
-    When I invoke Automux with the recipe "test_recipe" and the blueprint "default"
+    When I invoke Automux with the recipe "test_recipe" and the blueprint "test_sample"
     Then the rendered sequence of shell commands should be
       """
       echo using the test blueprint
@@ -29,7 +29,7 @@ Feature: User using a custom recipe
         = new_window(window)
 
         - window.panes.each do |pane|
-          = create_pane if pane.index > 0
+          = split_window if pane.index > 0
           = send_keys(window, pane.command)
         - end
       - end

data/features/general_usage.feature

@@ -60,7 +60,7 @@ In order to run the shell commands matching the given blueprint
       tmux attach-session -t test
       """
 
-  Scenario: Windows with clashing index values
+  Scenario: Windows with clashing indexes will be overwritten
     Given I have the following blueprint named "test_sample"
       """
       name: test
@@ -85,9 +85,9 @@ In order to run the shell commands matching the given blueprint
       tmux rename-window -t test:1 editor
       tmux send-keys -t test:1 "vim" C-m
 
-      tmux new-window -t test:0 2> /dev/null
-      tmux rename-window -t test:0 top
-      tmux send-keys -t test:0 "top" C-m
+      tmux new-window -t test:1 2> /dev/null
+      tmux rename-window -t test:1 top
+      tmux send-keys -t test:1 "top" C-m
 
       tmux attach-session -t test
       """

data/features/runtime_options.feature

@@ -27,6 +27,7 @@ Feature: Providing runtime options for blueprints
     Given I have the following blueprint named "test_sample"
       """
       name: test
+      root: '-d:'
       windows:
         - name: git
           panes: git pull "-r:" master
@@ -82,3 +83,20 @@ Feature: Providing runtime options for blueprints
       tmux attach-session -t test
       """
 
+  Scenario: Passing recipe as the last argument after options
+    Given I have the following recipe named "test_recipe"
+      """
+      cd <%= root %>
+      """
+      And I have the following blueprint named "test_sample"
+        """
+        name: test
+        root: '-r:'
+        windows:
+          - panes: vim
+        """
+    When I invoke Automux with the arguments "test_sample -r projects test_recipe"
+    Then the rendered sequence of shell commands should be
+      """
+      cd projects
+      """

data/features/setup_windows.feature

@@ -1,6 +1,6 @@
 Feature: Creating Window objects from user provided data
 
-    Scenario: Window with conflicting indexes
+    Scenario: Window with conflicting indexes will be overwritten
     Given I have provided a blueprint with the following window information
       | name   | index  | panes   |
       | first  | 1      | top     |
@@ -16,7 +16,7 @@ Feature: Creating Window objects from user provided data
         | 2     |
       And the window with the name "third" should have the following
         | index |
-        | 3     |
+        | 1     |
       And the window with the name "fourth" should have the following
         | index |
         | 0     |

data/features/step_definitions/custom_recipes_steps.rb

@@ -1,8 +1,3 @@
-Given(/^I have the following recipe named "(.+)"$/) do |name, string|
-  path = File.join(Automux::Paths.recipes_container, "#{ name }.sh.erb")
-  File.open(path, 'w') { |f| f.write(string) }
-end
-
 When(/^I invoke Automux with the recipe "(.+)" and the blueprint "(.+)"$/) do |recipe_name, blueprint_name|
   system %[bin/automux #{ blueprint_name } #{ recipe_name }]
   @results = File.read('/tmp/results')

data/features/step_definitions/shared_steps.rb

@@ -41,3 +41,13 @@ When(/^I invoke Automux with the blueprint "(.*?)"$/) do |name|
   system %[bin/automux #{ name }]
   @results = File.read('/tmp/results')
 end
+
+When(/^I invoke Automux with the arguments "(.*?)"$/) do |arguments|
+  system %[bin/automux #{ arguments }]
+  @results = File.read('/tmp/results')
+end
+
+Given(/^I have the following recipe named "(.+)"$/) do |name, string|
+  path = File.join(Automux::Paths.recipes_container, "#{ name }.sh.erb")
+  File.open(path, 'w') { |f| f.write(string) }
+end

data/lib/automux.rb

@@ -4,6 +4,8 @@ require 'automux/paths'
 require 'automux/library'
 require 'automux/core'
 require 'automux/controller'
+require 'automux/null'
+require 'automux/redirector'
 require 'automux/cache'
 require 'automux/initializers'
 

data/lib/automux/cache.rb

@@ -1,7 +1,7 @@
 require 'automux/cache/blueprint'
 require 'automux/cache/recipe'
 
-module Automux::Cache
+module Automux::Cache # :nodoc: all
   class << self
     def module_constants
       constants.select { |constant_name| const_get(constant_name).is_a?(Module) }

data/lib/automux/cache/blueprint.rb

@@ -10,10 +10,12 @@ module Automux
           blueprint = Automux::Core::Blueprint.new(path)
           Instances[blueprint.name] = blueprint
         end
+
+        Instances[nil] = Instances['default']
       end
 
       def find_by_name(name)
-        Instances[name]
+        Instances[name] || Automux::Null::Blueprint.new(name)
       end
     end
   end

data/lib/automux/cache/recipe.rb

@@ -10,10 +10,12 @@ module Automux
           recipe = Automux::Core::Recipe.new(path)
           Instances[recipe.name] = recipe
         end
+
+        Instances[nil] = Instances['default']
       end
 
       def find_by_name(name)
-        Instances[name]
+        Instances[name] || Automux::Null::Recipe.new(name)
       end
 
       private ###

data/lib/automux/controller.rb

@@ -5,7 +5,7 @@ require 'automux/controller/recipes'
 require 'automux/controller/blueprints'
 require 'automux/controller/messages'
 
-module Automux::Controller
+module Automux::Controller # :nodoc:
   class << self
     def base_inheriting_classes
       constants.select { |constant_name| const_get(constant_name) < Base }

data/lib/automux/controller/base.rb

@@ -1,6 +1,6 @@
 module Automux
   module Controller
-    class Base
+    class Base     # :nodoc:
       include Support::Rendering
       extend Support::Filters
 
@@ -15,7 +15,7 @@ module Automux
       end
 
       def check_blueprint
-        notify_error "Unable to find blueprint named #{ params[:blueprint_name] }.yml" if @blueprint.nil?
+        notify_error "Unable to find blueprint named #{ @blueprint.name }.yml" if @blueprint.is_a?(Automux::Null::Blueprint)
       end
     end
   end

data/lib/automux/controller/blueprints.rb

@@ -1,6 +1,6 @@
 module Automux
   module Controller
-    class Blueprints < Base
+    class Blueprints < Base  # :nodoc:
       before_filter :load_blueprint, only: [:edit, :copy, :cp, :delete, :rm]
       before_filter :check_blueprint, only: [:edit, :copy, :cp, :delete, :rm]
 

data/lib/automux/controller/messages.rb

@@ -1,6 +1,6 @@
 module Automux
   module Controller
-    class Messages < Base
+    class Messages < Base     # :nodoc:
       def error
         error = Automux::Core::Error.new(params[:message])
         @binding = error.get_binding

data/lib/automux/controller/recipes.rb

@@ -1,6 +1,6 @@
 module Automux
   module Controller
-    class Recipes < Base
+    class Recipes < Base     # :nodoc:
       before_filter :load_recipe, only: :automate
       before_filter :load_blueprint, only: :automate
       before_filter :check_blueprint, only: :automate
@@ -9,7 +9,7 @@ module Automux
 
       def automate
         @binding = @session.get_binding
-        render @recipe.path
+        render_file @recipe.path
       end
 
       private ###
@@ -23,11 +23,11 @@ module Automux
       end
 
       def check_recipe
-        notify_error "Unable to find recipe named #{ params[:recipe_name] }.sh.erb" if @recipe.nil?
+        notify_error "Unable to find recipe named #{ @recipe.name }.sh.erb" if @recipe.is_a?(Automux::Null::Recipe)
       end
 
       def load_and_setup_session
-        @session = Automux::Core::Tmux::Session.new(@blueprint.read)
+        @session = Automux::Core::Tmux::Session.new(@blueprint.read(params[:options]))
         @session.setup
       end
     end

data/lib/automux/controller/support/rendering.rb

@@ -3,19 +3,18 @@ module Automux
     module Support
       module Rendering
 
+        def render(view)
+          path = deduce_full_path(view)
+          render_file(path)
+        end
+
         # There are two requirements to render a file.
         # 1. @binding
         # 2. file_name
-        def render(view)
-          path =
-          # If the full path to the file is given, use that instead.
-          if FileTest.exists?(view)
-            view
-          else
-            deduce_full_path(view)
-          end
-
-          execute Automux::Library::MiniErb.new(File.read(path)).result(@binding)
+        def render_file(path)
+          result = Automux::Library::MiniErb.new(File.read(path)).result(@binding)
+          modified_result = remove_empty_lines(result)
+          environmental_execute modified_result
         end
 
         private ###
@@ -28,15 +27,17 @@ module Automux
           File.join(Paths.root, Paths.views, views_folder_name, "#{ view }.sh.erb")
         end
 
-        def execute(result)
-          modified_result = remove_empty_lines(result)
+        def environmental_execute(result)
+          send("#{ ENV['AUTOMUX_ENV'] }_execute", result)
+        end
+
+        def production_execute(result)
+          exec(result)
+        end
 
-          if ENV['AUTOMUX_ENV'] == 'test'
-            File.open('/tmp/results', 'w') { |f| f.write(modified_result) }
-            exit
-          else
-            exec(modified_result)
-          end
+        def test_execute(result)
+          File.open('/tmp/results', 'w') { |f| f.write(result) }
+          exit
         end
 
         # The recipe files can have empty lines for clarity. Remove them here.

data/lib/automux/core.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'automux/core/support'
 require 'automux/core/base'
 require 'automux/core/hook'
@@ -7,5 +8,6 @@ require 'automux/core/recipe'
 require 'automux/core/blueprint'
 require 'automux/core/error'
 
+
 module Automux::Core
 end

data/lib/automux/core/blueprint.rb

@@ -8,11 +8,11 @@ module Automux
         @path = path
       end
 
-      def read
-        Automux::Library::YamlParser.load_file(path)
+      def read(options = [])
+        Automux::Library::YamlParser.load_file(path, options)
       end
 
-      def get_binding
+      def get_binding # :nodoc:
         binding
       end
 

data/lib/automux/core/error.rb

@@ -7,7 +7,7 @@ module Automux
         @message = message
       end
 
-      def get_binding
+      def get_binding # :nodoc:
         binding
       end
     end

data/lib/automux/core/support/custom_accessors.rb

@@ -1,7 +1,7 @@
 module Automux
   module Core
     module Support
-      module CustomAccessors
+      module CustomAccessors # :nodoc:
         def dup_attr_reader(*names)
           names.each do |name|
             define_method name do

data/lib/automux/core/support/hooks_helper.rb

@@ -2,9 +2,6 @@ module Automux
   module Core
     module Support
       module HooksHelper
-        attr_reader :data_hooks
-        private :data_hooks
-
         def pre_hooks
           hooks.select(&:pre?)
         end
@@ -15,8 +12,8 @@ module Automux
 
         private ###
 
-        def setup_hooks
-          data_hooks.each do |type, commands|
+        def setup_hooks # :nodoc:
+          data.hooks.each do |type, commands|
             [commands].flatten.each do |command|
               @hooks << Hook.new(self, type, command)
             end

data/lib/automux/core/support/options_helper.rb

@@ -1,14 +1,11 @@
 module Automux
   module Core
     module Support
-      module OptionsHelper
-        attr_reader :data_options
-        private :data_options
-
+      module OptionsHelper # :nodoc:
         private ###
 
         def setup_options
-          data_options.each do |name, value|
+          data.options.each do |name, value|
             @options << Automux::Core::Option.new(name, value)
           end
         end

data/lib/automux/core/tmux/session.rb

@@ -4,22 +4,31 @@ module Automux
       class Session < Base
         include Support::HooksHelper
         include Support::OptionsHelper
+        extend Forwardable
 
-        attr_reader :data, :name, :root, :data_windows, :flags, :base_index
+        attr_reader :data, :base_index
         dup_attr_reader :windows, :hooks, :options
-        private :data, :data_windows
+        def_delegators :data, :name, :root, :flags
 
         def initialize(blueprint_data)
-          @data = blueprint_data
-          @name = data['name']
-          @root = data['root'] || '.'
-          @data_windows = data['windows'] || []
-          @data_hooks = data['hooks'] || []
           @windows = []
-          @flags = data['flags']
           @hooks = []
-          @data_options = data['options'] || []
           @options = []
+          @base_index = 0
+          @data = Data.new(blueprint_data)
+        end
+
+        class Data
+          attr_reader :windows, :hooks, :options, :flags, :name, :root
+
+          def initialize(attributes)
+            @windows = attributes['windows'] || []
+            @hooks = attributes['hooks'] || []
+            @options = attributes['options'] || []
+            @name = attributes['name']
+            @root = attributes['root'] || '.'
+            @flags = attributes['flags']
+          end
         end
 
         def start_server
@@ -54,8 +63,8 @@ module Automux
 
         # Links window from source session to current session. Window name or index must be provided.
         #
-        # E.g.: link_window(primary, finch, 3)
-        # This links a window named *finch* from an existing session named *primary* as 3rd window in current session.
+        # E.g.: +link_window+(primary, finch, 3)
+        # - links a window named _finch_ from an existing session named _primary_ as 3rd window in current session.
         def link_window(source_session_name, source_window_identifier, index = nil)
           %[tmux link-window -s #{ source_session_name }:#{ source_window_identifier } -t #{ name }:#{ index }]
         end
@@ -68,10 +77,16 @@ module Automux
           %[tmux select-layout -t #{ name }:#{ window.index } #{ window.layout }]
         end
 
-        def create_pane
+        def split_window
           %[tmux split-window]
         end
 
+        def window_indexes
+          @windows.map(&:index).compact
+        end
+
+        # :stopdoc:
+
         def get_binding
           binding
         end
@@ -83,10 +98,6 @@ module Automux
           setup_hooks
         end
 
-        def window_indexes
-          @windows.map(&:index).compact
-        end
-
         def next_available_window_index
           n = base_index + number_of_windows
           (Array(base_index..n) - window_indexes).first
@@ -106,18 +117,6 @@ module Automux
           @windows << window
         end
 
-        # When multiple windows have been assigned the same index by the user, the additional window indexes will be removed.
-        def remove_duplicate_indexes(original_data)
-          non_indexed_data = original_data.select { |h| h['index'].to_s.empty? }
-          indexed_data = original_data - non_indexed_data
-
-          uniq_indexed_data = indexed_data.uniq { |h| h['index'] }
-          conflicting_data = indexed_data - uniq_indexed_data
-          removed_index_data = conflicting_data.each { |h| h.delete('index') }
-
-          non_indexed_data + uniq_indexed_data + removed_index_data
-        end
-
         def add_windows(windows_data)
           windows_data.each do |window_data|
             window = Automux::Core::Tmux::Window.new(self, window_data)
@@ -126,14 +125,12 @@ module Automux
         end
 
         def setup_windows
-          windows_data = remove_duplicate_indexes(data_windows)
-          add_windows(windows_data)
+          add_windows(data.windows)
           @windows.each(&:update_index)
           @windows.each(&:setup)
         end
 
         def setup_base_index
-          @base_index = 0
           if option = options.find { |option| option.name == 'base-index' }
             @base_index = option.value.to_i
           end

data/lib/automux/core/tmux/window.rb

@@ -4,58 +4,66 @@ module Automux
       class Window < Base
         include Support::HooksHelper
         include Support::OptionsHelper
+        extend Forwardable
 
-        attr_reader :data, :session, :index, :root
+        attr_reader :data, :session, :index
         dup_attr_reader :panes, :hooks, :options
-        private :data, :session
+        def_delegators :data, :name, :root, :layout
+        def_delegator :data, :is_optional, :is_optional?
 
-        def initialize(session, data)
+        def initialize(session, window_data)
           @session = session
-          @data = data
-          @opt = data['opt']
-          @index = data['index']
-          @root = data['root']
-          @data_hooks = data['hooks'] || []
           @hooks = []
-          @data_options = data['options'] || []
           @options = []
           @panes = []
+          @data = Data.new(window_data)
+          @index = @data.index
         end
 
-        def set_option(option)
-          %[tmux set-window-option -t #{ session.name }:#{ index } #{ option.name } '#{ option.value }']
-        end
+        class Data
+          attr_reader :opt, :index, :name, :root, :layout, :hooks, :options, :panes, :is_optional
 
-        def name
-          data['name']
+          def initialize(attributes)
+            @is_optional = attributes.has_key?('opt')
+            @opt = attributes['opt']
+            @index = attributes['index']
+            @name = attributes['name']
+            @root = attributes['root']
+            @layout = attributes['layout']
+            @hooks = attributes['hooks'] || []
+            @options = attributes['options'] || []
+            @panes = attributes['panes']
+          end
         end
 
-        def setup
-          setup_options
-          setup_panes
-          setup_hooks
+        def set_option(option)
+          %[tmux set-window-option -t #{ session.name }:#{ index } #{ option.name } '#{ option.value }']
         end
 
         def has_panes?
           !@panes.nil?
         end
 
-        def layout
-          data['layout']
+        def opted_in?
+          return true unless is_optional?
+
+          data.opt
         end
 
-        def update_index
-          @index ||= session.next_available_window_index
+        def change_root_command
+          %[cd #{ root }]
         end
 
-        def opted_in?
-          return true if @opt.nil?
+        # :stopdoc:
 
-          @opt
+        def update_index
+          @index ||= session.next_available_window_index
         end
 
-        def change_root_command
-          %[cd #{ root }]
+        def setup
+          setup_options
+          setup_panes
+          setup_hooks
         end
 
         def get_binding
@@ -65,7 +73,7 @@ module Automux
         private ###
 
         def setup_panes
-          [data['panes']].flatten.each do |command|
+          [data.panes].flatten.each do |command|
             pane = Automux::Core::Tmux::Pane.new(self, command)
             @panes << pane
           end

data/lib/automux/installation.rb

@@ -1,10 +1,10 @@
 module Automux
-  module Installation
-    MESSAGE = <<-END
-********************************************************************************
-Please run the following the following command to setup default Automux folders:
-$ automux setup
-********************************************************************************
+  module Installation # :nodoc:
+    MESSAGE = <<-END.gsub(/^\s+/, '')
+      ********************************************************************************
+      Please run the following the following command to setup default Automux folders:
+      $ automux setup
+      ********************************************************************************
     END
   end
 end

data/lib/automux/library.rb

@@ -1,5 +1,6 @@
 require 'automux/library/mini_erb'
 require 'automux/library/yaml_parser'
+require 'automux/library/file_options_parser'
 
 module Automux::Library
 end

data/lib/automux/library/file_options_parser.rb

@@ -0,0 +1,37 @@
+require 'optparse'
+
+module Automux
+  module Library
+    class FileOptionsParser  # :nodoc:
+      attr_reader :path
+
+      def initialize(path)
+        @path = path
+      end
+
+      def getopts
+        options = file_opts_with_nil_values(path)
+
+        OptionParser.new do |parser|
+          options.keys.each do |opt_name|
+            parser.on(opt_name) { |value| options[opt_name] = value }
+          end
+        end.parse!
+
+        options
+      end
+
+      private ###
+
+      def file_opts_with_nil_values(path)
+        opts = get_file_opts(path)
+        Hash[opts.zip]
+      end
+
+      # Scan for patterns like "-\w" or '-\w' to get a opts list.
+      def get_file_opts(path)
+        File.read(path).scan(/['|"](-\w:?)['|"]/m).flatten
+      end
+    end
+  end
+end

data/lib/automux/library/mini_erb.rb

@@ -2,7 +2,7 @@ require 'erb'
 
 module Automux
   module Library
-    class MiniErb < ERB
+    class MiniErb < ERB  # :nodoc:
 
       def initialize(template)
         modified_template = erb_parseable_template(template)
@@ -14,8 +14,8 @@ module Automux
       # - [1, 2, 3]      =>     % [1, 2, 3]
       # = [1, 2, 3]      =>     <%= [1, 2, 3] %>
       def erb_parseable_template(string)
-        string.gsub(/^\s*-(.+)$/, '%\1').
-               gsub(/^\s*=(.+)$/, '<%=\1 %> ')
+        string.gsub(/^\s*-(.+)$/, '%\1')
+              .gsub(/^\s*=(.+)$/, '<%=\1 %> ')
       end
     end
   end

data/lib/automux/library/yaml_parser.rb

@@ -1,40 +1,26 @@
 require 'yaml'
-require 'optparse'
 
 module Automux
   module Library
-    class YamlParser
+    class YamlParser  # :nodoc:
       class << self
-        def load_file(file)
-          data_string = File.read(file)
-          opts_replaced_string = replace_opts_with_user_input(data_string)
+        def load_file(file_path, parsed_options)
+          data_string = File.read(file_path)
+          opts_replaced_string = replace_opts(data_string, parsed_options)
           YAML.load(opts_replaced_string)
         end
 
         private ###
 
-        # Scan blueprint for patterns like "-\w" or '-\w' to get a options list.
-        # The options list is used by OptionsParser to read the options from commandline.
-        def replace_opts_with_user_input(string)
-          blueprint_opts = string.scan(/['|"]-(\w:?)['|"]/m).flatten
-          user_input_values = get_options(blueprint_opts)
-          replace_opts(string, user_input_values)
-        end
-
         # Replace patterns like "-\w" with matching commandline option.
-        def replace_opts(string, values)
-          values.each do |k, v|
+        def replace_opts(string, parsed_options)
+          parsed_options.each do |k, v|
             # Interpolate #{ v } - to substitute literal booleans.
-            string.gsub!(/['|"]-(#{ k }):?['|"]/m, "#{ v }")
+            string.gsub!(/['|"](#{ k }):?['|"]/m, "#{ v }")
           end
 
           string
         end
-
-        def get_options(opts)
-          ARGV.shift while ARGV[0].to_s.match(/^\w/)
-          ARGV.getopts(*opts)
-        end
       end
     end
   end

data/lib/automux/null.rb

@@ -0,0 +1,8 @@
+require 'automux/null/base'
+require 'automux/null/blueprint'
+require 'automux/null/recipe'
+
+module Automux
+  module Null
+  end
+end

data/lib/automux/null/base.rb

@@ -0,0 +1,15 @@
+module Automux
+  module Null
+    class Base
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def path
+        '/dev/null'
+      end
+    end
+  end
+end

data/lib/automux/null/blueprint.rb

@@ -0,0 +1,6 @@
+module Automux
+  module Null
+    class Blueprint < Base
+    end
+  end
+end

data/lib/automux/null/recipe.rb

@@ -0,0 +1,6 @@
+module Automux
+  module Null
+    class Recipe < Base
+    end
+  end
+end

data/lib/automux/redirector.rb

@@ -0,0 +1,6 @@
+require 'automux/redirector/default'
+require 'automux/redirector/setup'
+require 'automux/redirector/blueprint'
+
+module Automux::Redirector
+end

data/lib/automux/redirector/blueprint.rb

@@ -0,0 +1,23 @@
+module Automux
+  module Redirector
+    class Blueprint  # :nodoc:
+      attr_reader :action, :blueprint_name, :clone_name
+
+      def initialize(args)
+        @action = args[1]
+        @blueprint_name = args[2]
+        @clone_name = args[3]
+      end
+
+      def redirect
+        Automux::Controller::Blueprints.new(params).public_send(action)
+      end
+
+      private ###
+
+      def params
+        { blueprint_name: blueprint_name, clone_name: clone_name }
+      end
+    end
+  end
+end

data/lib/automux/redirector/default.rb

@@ -0,0 +1,32 @@
+module Automux
+  module Redirector
+    class Default  # :nodoc:
+      attr_reader :blueprint_name, :recipe_name, :options
+
+      def initialize(argv)
+        @blueprint_name = non_opt_argument_or_nil(argv[0])
+        @options = get_options
+        @recipe_name = argv[1]
+      end
+
+      def redirect
+        Automux::Controller::Recipes.new(params).automate
+      end
+
+      private ###
+
+      def get_options
+        blueprint = Automux::Cache::Blueprint.find_by_name(blueprint_name)
+        Automux::Library::FileOptionsParser.new(blueprint.path).getopts
+      end
+
+      def params
+        { blueprint_name: blueprint_name, recipe_name: recipe_name, options: options }
+      end
+
+      def non_opt_argument_or_nil(value)
+        value.to_s.slice(/^\w+$/)
+      end
+    end
+  end
+end

data/lib/automux/redirector/setup.rb

@@ -0,0 +1,12 @@
+module Automux
+  module Redirector
+    class Setup  # :nodoc:
+      def initialize(args)
+      end
+
+      def redirect
+        Automux::Controller::Setup.new.clone_defaults
+      end
+    end
+  end
+end

data/lib/automux/version.rb

@@ -1,5 +1,5 @@
 module Automux
   module Version
-    STRING = '0.2.0'
+    STRING = '0.3.0'
   end
 end

data/test/command_line.rb

@@ -0,0 +1,7 @@
+require 'support/test_helper'
+
+describe 'command_line' do
+  it "must work when invoked without arguments" do
+    system('bin/automux').must_equal true
+  end
+end

data/test/session_test.rb

@@ -2,15 +2,20 @@ require 'support/test_helper'
 
 describe 'Session' do
   it "should assign window indexes" do
-
     windows_data = [nil, nil, 1, 0].map do |i|
       HashFactory.build(:window, index: i)
     end
-    data = HashFactory.build(:session, windows: windows_data)
-
-    session = Automux::Core::Tmux::Session.new(data)
-    session.setup_windows_and_hooks
 
+    session = setup_session_with_windows(windows_data)
     session.window_indexes.must_equal [2, 3, 1, 0]
   end
+
+  it "should assign overwrite conflicting indexes" do
+    windows_data = [nil, nil, 1, 1].map do |i|
+      HashFactory.build(:window, index: i)
+    end
+
+    session = setup_session_with_windows(windows_data)
+    session.window_indexes.must_equal [0, 2, 1, 1]
+  end
 end

data/test/support/common_methods.rb

@@ -0,0 +1,6 @@
+def setup_session_with_windows(windows_data)
+  data = HashFactory.build(:session, windows: windows_data)
+  session = Automux::Core::Tmux::Session.new(data)
+  session.setup
+  session
+end

data/test/support/test_helper.rb

@@ -5,3 +5,4 @@ require 'minitest/autorun'
 require 'automux'
 require 'support/hash_factory'
 require 'support/factories'
+require 'support/common_methods'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automux
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies: []
 description: Highly configurable Tmux Automator
 email:
@@ -31,10 +31,10 @@ files:
 - features/custom_recipes.feature
 - features/error_messages.feature
 - features/general_usage.feature
+- features/hooks.feature
 - features/managing_blueprints.feature
 - features/runtime_options.feature
 - features/session_and_window_options.feature
-- features/session_hooks.feature
 - features/setup_windows.feature
 - features/step_definitions/custom_recipes_steps.rb
 - features/step_definitions/managing_blueprints_steps.rb
@@ -77,9 +77,18 @@ files:
 - lib/automux/initializers/setup_editor.rb
 - lib/automux/installation.rb
 - lib/automux/library.rb
+- lib/automux/library/file_options_parser.rb
 - lib/automux/library/mini_erb.rb
 - lib/automux/library/yaml_parser.rb
+- lib/automux/null.rb
+- lib/automux/null/base.rb
+- lib/automux/null/blueprint.rb
+- lib/automux/null/recipe.rb
 - lib/automux/paths.rb
+- lib/automux/redirector.rb
+- lib/automux/redirector/blueprint.rb
+- lib/automux/redirector/default.rb
+- lib/automux/redirector/setup.rb
 - lib/automux/version.rb
 - lib/automux/views/blueprints/copy.sh.erb
 - lib/automux/views/blueprints/create.sh.erb
@@ -88,6 +97,7 @@ files:
 - lib/automux/views/blueprints/index.sh.erb
 - lib/automux/views/messages/error.sh.erb
 - lib/automux/views/setup/clone_defaults.sh.erb
+- test/command_line.rb
 - test/session_test.rb
 - test/support/common_methods.rb
 - test/support/factories.rb
@@ -130,10 +140,10 @@ test_files:
 - features/custom_recipes.feature
 - features/error_messages.feature
 - features/general_usage.feature
+- features/hooks.feature
 - features/managing_blueprints.feature
 - features/runtime_options.feature
 - features/session_and_window_options.feature
-- features/session_hooks.feature
 - features/setup_windows.feature
 - features/step_definitions/custom_recipes_steps.rb
 - features/step_definitions/managing_blueprints_steps.rb
@@ -142,6 +152,7 @@ test_files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/support/transformations.rb
+- test/command_line.rb
 - test/session_test.rb
 - test/support/common_methods.rb
 - test/support/factories.rb