automux 0.3.0 → 0.3.1

data/README.md

@@ -182,6 +182,8 @@ windows:
 
 `automux test` will use the current directory.
 
+`automux test -h` will list the valid options.
+
 #### Note
 
 * Since the opts are derived from the blueprint, the blueprint name needs to precede the opts as seen in the above commands.
@@ -253,10 +255,10 @@ This will execute the following steps
 * ... tmux startup stuff
 * ... create first window
 * cd automux
-* pwd   => ~/projects/automux
+* pwd #=> ~/projects/automux
 * vim
 * ... create second window
-* pwd    => ~/projects
+* pwd #=> ~/projects
 
 The session/window hooks have access to session and window objects respectively.
 
@@ -314,12 +316,12 @@ 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. Custom recipes can be run like so:
+Its a simpler form of ERB, much like [HAML](https://github.com/haml/haml) without indentation sensitivity. 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._
+_Where 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.
 

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

@@ -12,7 +12,7 @@ cd <%= root %>
 - end
 
 - windows.each do |window|
-  = new_window(window)
+  = move_first_window_or_create_new(window)
   = rename_window(window) if window.name
 
   - if window.has_panes?

data/features/custom_recipes.feature

@@ -56,7 +56,7 @@ Feature: User using a custom recipe
       tmux start-server
       tmux new-session -d -s test
 
-      tmux new-window -t test:2 2> /dev/null
+      tmux new-window -t test:2
       tmux send-keys -t test:2 "vim" C-m
 
       tmux attach-session -t test

data/features/error_messages.feature

@@ -34,3 +34,17 @@ Feature: Handling various errors with relevant messages
       """
       echo Unable to find blueprint named test_sample.yml
       """
+
+  Scenario: Trying incorrect blueprint opts
+    Given I have the following blueprint named "test_sample"
+      """
+      name: opt-less
+      root: '-r'
+      """
+    When Automux processes the blueprint "test_sample" with the following options
+      | option | value |
+      | -n     | test  |
+    Then the rendered sequence of shell commands should contain
+      """
+      echo Incorrect option passed. Try -h to check valid options.
+      """

data/features/general_usage.feature

@@ -33,7 +33,7 @@ In order to run the shell commands matching the given blueprint
       tmux start-server
       tmux new-session -d -s test
 
-      tmux new-window -t test:2 2> /dev/null
+      tmux move-window -t test:2
       tmux rename-window -t test:2 editor
 
       tmux send-keys -t test:2 "ls" C-m
@@ -43,15 +43,15 @@ In order to run the shell commands matching the given blueprint
       tmux send-keys -t test:2 "pwd" C-m
       tmux select-layout -t test:2 main-vertical
 
-      tmux new-window -t test:3 2> /dev/null
+      tmux new-window -t test:3
       tmux rename-window -t test:3 htop
       tmux send-keys -t test:3 "htop" C-m
 
-      tmux new-window -t test:1 2> /dev/null
+      tmux new-window -t test:1
       tmux rename-window -t test:1 tester
       tmux send-keys -t test:1 "pwd" C-m
 
-      tmux new-window -t test:0 2> /dev/null
+      tmux new-window -t test:0
       tmux rename-window -t test:0 zero
       tmux send-keys -t test:0 "pwd" C-m
       tmux split-window
@@ -81,11 +81,11 @@ In order to run the shell commands matching the given blueprint
       tmux start-server
       tmux new-session -d -s test
 
-      tmux new-window -t test:1 2> /dev/null
+      tmux move-window -t test:1
       tmux rename-window -t test:1 editor
       tmux send-keys -t test:1 "vim" C-m
 
-      tmux new-window -t test:1 2> /dev/null
+      tmux new-window -t test:1
       tmux rename-window -t test:1 top
       tmux send-keys -t test:1 "top" C-m
 
@@ -123,7 +123,7 @@ In order to run the shell commands matching the given blueprint
       tmux start-server
       tmux new-session -d -s name-less
 
-      tmux new-window -t name-less:0 2> /dev/null
+      tmux move-window -t name-less:0
       tmux send-keys -t name-less:0 "git pull origin master" C-m
 
       tmux attach-session -t name-less
@@ -145,7 +145,7 @@ In order to run the shell commands matching the given blueprint
       tmux start-server
       tmux -u2 new-session -d -s flagged
 
-      tmux new-window -t flagged:0 2> /dev/null
+      tmux move-window -t flagged:0
       tmux send-keys -t flagged:0 "vim" C-m
 
       tmux -u2 attach-session -t flagged
@@ -169,11 +169,11 @@ In order to run the shell commands matching the given blueprint
       tmux start-server
       tmux new-session -d -s test
 
-      tmux new-window -t test:0 2> /dev/null
+      tmux move-window -t test:0
       tmux send-keys -t test:0 "cd projects" C-m
       tmux send-keys -t test:0 "vim" C-m
 
-      tmux new-window -t test:1 2> /dev/null
+      tmux new-window -t test:1
       tmux send-keys -t test:1 "top" C-m
 
       tmux attach-session -t test

data/features/hooks.feature

@@ -25,11 +25,11 @@ Feature: Using pre and post hooks for session
       tmux start-server
       tmux new-session -d -s hooked
 
-      tmux new-window -t hooked:0 2> /dev/null
+      tmux move-window -t hooked:0
       tmux rename-window -t hooked:0 one
       tmux send-keys -t hooked:0 "" C-m
 
-      tmux new-window -t hooked:1 2> /dev/null
+      tmux new-window -t hooked:1
       tmux rename-window -t hooked:1 two
       tmux send-keys -t hooked:1 "" C-m
 
@@ -65,10 +65,10 @@ Feature: Using pre and post hooks for session
       tmux start-server
       tmux new-session -d -s hooked
 
-      tmux new-window -t hooked:0 2> /dev/null
+      tmux move-window -t hooked:0
       tmux send-keys -t hooked:0 "pwd" C-m
 
-      tmux new-window -t hooked:1 2> /dev/null
+      tmux new-window -t hooked:1
       tmux rename-window -t hooked:1 echoed-window
 
       tmux send-keys -t hooked:1 "echo echoed-window start" C-m

data/features/runtime_options.feature

@@ -42,7 +42,7 @@ Feature: Providing runtime options for blueprints
       tmux start-server
       tmux new-session -d -s test
 
-      tmux new-window -t test:0 2> /dev/null
+      tmux move-window -t test:0
       tmux rename-window -t test:0 git
       tmux send-keys -t test:0 "git pull origin master" C-m
 
@@ -72,11 +72,11 @@ Feature: Providing runtime options for blueprints
       tmux start-server
       tmux new-session -d -s test
 
-      tmux new-window -t test:0 2> /dev/null
+      tmux move-window -t test:0
       tmux rename-window -t test:0 vim
       tmux send-keys -t test:0 "vim" C-m
 
-      tmux new-window -t test:1 2> /dev/null
+      tmux new-window -t test:1
       tmux rename-window -t test:1 top
       tmux send-keys -t test:1 "top" C-m
 

data/features/session_and_window_options.feature

@@ -26,7 +26,7 @@ Feature: Handling session/window specific options
       tmux set-option status-left '#S>'
       tmux set-option status 'off'
 
-      tmux new-window -t test:0 2> /dev/null
+      tmux move-window -t test:0
       tmux send-keys -t test:0 "pwd" C-m
 
       tmux set-window-option -t test:0 automatic-rename 'off'
@@ -57,10 +57,10 @@ Feature: Handling session/window specific options
 
       tmux set-option base-index '2'
 
-      tmux new-window -t test:2 2> /dev/null
+      tmux move-window -t test:2
       tmux send-keys -t test:2 "pwd" C-m
 
-      tmux new-window -t test:3 2> /dev/null
+      tmux new-window -t test:3
       tmux send-keys -t test:3 "ls" C-m
 
       tmux attach-session -t test

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

@@ -44,13 +44,26 @@ module Automux
         end
 
         def new_window(window)
-          %[tmux new-window -t #{ name }:#{ window.index } 2> /dev/null]
+          %[tmux new-window -t #{ name }:#{ window.index }]
+        end
+
+        # The first window is created alongwith new-session and thus needs to be moved to its correct index.
+        def move_first_window_or_create_new(window)
+          if window == windows.first
+            move_window(window.index)
+          else
+            new_window(window)
+          end
         end
 
         def rename_window(window, window_name = window.name)
           %[tmux rename-window -t #{ name }:#{ window.index } #{ window_name }]
         end
 
+        def move_window(index)
+          %[tmux move-window -t #{ name }:#{ index }]
+        end
+
         def send_keys(identifier, command)
           window = get_window(identifier)
           %[tmux send-keys -t #{ name }:#{ window.index } "#{ command }" C-m]

data/lib/automux/library/file_options_parser.rb

@@ -30,7 +30,7 @@ module Automux
 
       # Scan for patterns like "-\w" or '-\w' to get a opts list.
       def get_file_opts(path)
-        File.read(path).scan(/['|"](-\w:?)['|"]/m).flatten
+        File.read(path).scan(/(?<='|")-\w:?(?='|")/m)
       end
     end
   end

data/lib/automux/redirector/default.rb

@@ -18,6 +18,8 @@ module Automux
       def get_options
         blueprint = Automux::Cache::Blueprint.find_by_name(blueprint_name)
         Automux::Library::FileOptionsParser.new(blueprint.path).getopts
+      rescue OptionParser::InvalidOption
+        Automux::Controller::Messages.new(message: 'Incorrect option passed. Try -h to check valid options.').error
       end
 
       def params

data/lib/automux/version.rb

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

data/lib/automux/views/messages/error.sh.erb

@@ -1,3 +1,3 @@
-printf "\033[0;31m"
+printf "\033[1;31m"
 echo <%= message %>
 printf "\033[0m"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automux
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies: []
 description: Highly configurable Tmux Automator
 email: