tlux 0.0.1 → 0.0.2

data/bin/tlux

@@ -17,6 +17,11 @@ if ARGV.any?
   rescue Tlux::Config::FileNotFound 
     puts "Tlux config file not found #{ARGV[0]}"
     exit 1
+
+  rescue Tlux::CommandNotFoundError
+    puts "Command not available"
+    exit 1
+
   end
 else
 
@@ -24,9 +29,9 @@ else
 Tlux version: #{Tlux::VERSION}
 
 Usage:
-  tlux new <config_name> : creates a new a config file and opens it in your editor
-  tlux list              : lists the currently available configs
-  tlux run <config_name> : attach a tmux session with the given config name
+  tlux open <config_name> : open the config file in your $EDITOR, creates config if it doesn't already exist
+  tlux list               : lists the currently available configs
+  tlux run <config_name>  : attach a tmux session with the given config name
 EOF
 end
 

data/lib/tlux.rb

@@ -5,6 +5,7 @@ require "fileutils"
 module Tlux
   TEMPLATES_PATH = File.join(File.dirname(__FILE__), 'tlux', 'templates')
   class EditorNotDefinedError < StandardError ; end
+  class CommandNotFoundError < StandardError ; end
 end
 
 require "tlux/splitable"

data/lib/tlux/commands.rb

@@ -1,8 +1,22 @@
 module Tlux
   module Commands
-    def self.run(command_name, args = [])
-      command = self.const_get("#{command_name.capitalize}Command").new(*args)
-      command.run
+    extend self
+
+    def run(command_name, args = [])
+      raise Tlux::CommandNotFoundError unless available?(command_name)
+      name_to_constant(command_name).new(*args).run
+    end
+
+    private
+
+    def available?(command_name)
+      !!name_to_constant(command_name)
+    rescue NameError
+      false
+    end
+
+    def name_to_constant(command_name)
+      self.const_get("#{command_name.capitalize}Command")
     end
   end
 end
@@ -10,4 +24,4 @@ end
 require 'tlux/commands/base'
 require 'tlux/commands/list_command'
 require 'tlux/commands/run_command'
-require 'tlux/commands/new_command'
+require 'tlux/commands/open_command'

data/lib/tlux/commands/{new_command.rb → open_command.rb}

@@ -1,6 +1,6 @@
 module Tlux
   module Commands
-    class NewCommand < Tlux::Commands::Base
+    class OpenCommand < Tlux::Commands::Base
       attr_reader :config_name
 
       def initialize(config_name)

data/lib/tlux/commands/run_command.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Tlux
   module Commands
     class RunCommand < Tlux::Commands::Base
@@ -11,21 +13,23 @@ module Tlux
       def run
         parser = Tlux::Config::Parser.from_file(config_file_path)
         parser.parse!
-        parser.session.name = config_name
-
-        write_output Tlux::Config::Generator.new(parser.session).generate!
+        parser.session.name = session_name
 
-        exec "tmux -f #{output_path} attach"
+        exec Tlux::Config::Generator.new(parser.session).generate!
       end
 
       private
 
+      def session_name
+        Pathname.new(Dir.pwd).basename.replace(/\./, '-').replace(/\:/, '-')
+      end
+
       def config_file_path
         File.join(config_path, config_name)
       end
 
       def output_path
-        File.join(generated_path, config_name)
+        File.join(generated_path, session_name)
       end
 
       def write_output(output)

data/lib/tlux/templates/config.erb

@@ -1,27 +1,31 @@
-# This file is automatically generated by tlux and should not be manually edited
-# To make changes to your config edit the file at ~/.tlux/<%= name %>
+tmux has-session <%= name %>
+if [ $? != 0 ]
+then
+  tmux new-session -s <%= name %> -n <%= windows.first.name %> -d
+  tmux send-keys -t <%= name %> 'cd <%= dir %>' C-m
 
-source-file ~/.tmux.conf
+  <% windows.each_with_index do |window, window_idx| %>
+    <% if window_idx > 0 %>
+      tmux new-window -n <%= window.name %> -t <%= name %>
+    <% end %>
 
-new-session -s <%= name %> -n <%= windows.first.name %> -d
-send-keys -t <%= name %> 'cd <%= dir %>' C-m
+    tmux send-keys -t <%= name %> 'cd <%= dir %>' C-m
 
-<% windows.each_with_index do |window, window_idx| %>
-  <% if window_idx > 0 %>
-    new-window -n <%= window.name %> -t <%= name %>
-  <% end %>
+    <% window.commands.each do |command| %>
+      tmux send-keys -t <%= name %> '<%= command %>' C-m
+    <% end %>
 
-  send-keys -t <%= name %> 'cd <%= dir %>' C-m
+    <% window.panes.each_with_index do |pane, pane_idx| %>
+      tmux split-window <%= pane.orientation %> <%= pane.size %> -t <%= name %>
+      tmux send-keys -t <%= name %>:<%= window_idx + 1 %>.<%= pane_idx + 1 %> 'cd <%= dir %>' C-m
 
-  <% window.commands.each do |command| %>
-    send-keys -t <%= name %> '<%= command %>' C-m
-  <% end %>
-
-  <% window.panes.each_with_index do |pane, pane_idx| %>
-    split-window <%= pane.orientation %> <%= pane.size %> -t <%= name %>
-    send-keys -t <%= name %>:<%= window_idx + 1 %>.<%= pane_idx + 1 %> 'cd <%= dir %>' C-m
-    <% pane.commands.each do |command| %>
-      send-keys -t <%= name %>:<%= window_idx + 1 %>.<%= pane_idx + 1 %> '<%= command %>' C-m
+      <% pane.commands.each do |command| %>
+        tmux send-keys -t <%= name %>:<%= window_idx + 1 %>.<%= pane_idx + 1 %> '<%= command %>' C-m
+      <% end %>
     <% end %>
   <% end %>
-<% end %>
+
+  tmux select-window -t <%= name %>:1
+
+fi
+tmux attach -t <%= name %>

data/lib/tlux/version.rb

@@ -1,3 +1,3 @@
 module Tlux
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/commands/commands_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Tlux::Commands do
+  describe ".run" do
+    let(:command) { double(Tlux::Commands::RunCommand, run: true) }
+    let(:args) { [1,2,3] }
+
+    before do
+      Tlux::Commands::RunCommand.stub!(:new).and_return(command)
+    end
+
+    context "with an available command" do
+      it "should instantiate a command and run it" do
+        command.should_receive(:run)
+        Tlux::Commands::RunCommand.should_receive(:new).with(*args)
+        Tlux::Commands.run('run', args)
+      end
+    end
+
+    context "with an unavailable command" do
+      it "should raise a CommandNotFoundError" do
+        expect {
+          Tlux::Commands.run('foo')
+        }.to raise_error(Tlux::CommandNotFoundError)
+      end
+    end
+  end
+end

data/spec/commands/{new_command_spec.rb → open_command_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Tlux::Commands::NewCommand do
+describe Tlux::Commands::OpenCommand do
   describe "#run" do
     let(:config_name) { 'foo' }
-    subject { Tlux::Commands::NewCommand.new(config_name) }
+    subject { Tlux::Commands::OpenCommand.new(config_name) }
 
     before :each do
       FakeFS.activate!

data/tlux.gemspec

@@ -16,5 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Tlux::VERSION
 
   gem.add_development_dependency('rspec')
+  gem.add_development_dependency('rake')
   #gem.add_development_dependency('fakefs')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tlux
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70260310518360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70260310518360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Luxurious tmux configuration
 email:
 - oliver.nightingale1@gmail.com
@@ -42,7 +63,7 @@ files:
 - lib/tlux/commands.rb
 - lib/tlux/commands/base.rb
 - lib/tlux/commands/list_command.rb
-- lib/tlux/commands/new_command.rb
+- lib/tlux/commands/open_command.rb
 - lib/tlux/commands/run_command.rb
 - lib/tlux/commands/start.rb
 - lib/tlux/commands/start_command.rb
@@ -57,8 +78,9 @@ files:
 - lib/tlux/version.rb
 - lib/tlux/window.rb
 - spec/commands/base_spec.rb
+- spec/commands/commands_spec.rb
 - spec/commands/list_command_spec.rb
-- spec/commands/new_command_spec.rb
+- spec/commands/open_command_spec.rb
 - spec/commands/run_command_spec.rb
 - spec/config/generator_spec.rb
 - spec/config/parser_spec.rb
@@ -82,22 +104,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 628163894706265299
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 628163894706265299
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Luxurious tmux configuration
 test_files:
 - spec/commands/base_spec.rb
+- spec/commands/commands_spec.rb
 - spec/commands/list_command_spec.rb
-- spec/commands/new_command_spec.rb
+- spec/commands/open_command_spec.rb
 - spec/commands/run_command_spec.rb
 - spec/config/generator_spec.rb
 - spec/config/parser_spec.rb