tlux 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d7852ef8bf693e95567621d7cd689cd0c5bd1aa9
+  data.tar.gz: ecdd70d66741a9281da1056ccd839d199bf5155b
+SHA512:
+  metadata.gz: 2ff7bb91b1c9e2f3d29209802bd9668552c208957ccdc48d611e85ccea92ca31192d340697caea86e64284ff1efb60d8f7cc0096321e97c93741aee1e4742b24
+  data.tar.gz: 0e7c4382b520516cc61a7de9bb8a4a7f8e8be45dde7b01a9adc59b863cdb54250ad23c83a1641989460b825b939b58d784ef40768bea077adc7365ebb6217dad

data/bin/tlux

@@ -4,34 +4,39 @@ lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'tlux'
+require 'commander/import'
 
-if ARGV.any?
-  begin
+program :name, 'tlux'
+program :version, Tlux::VERSION
+program :description, 'Luxurious tmux configuration'
 
-  puts Tlux::Commands.run(ARGV.shift, ARGV)
+command :run do |c|
+  c.syntax = 'tlux run <config>'
+  c.summary = 'Start a tmux session with the given config'
 
-  rescue Tlux::EditorNotDefinedError
-    puts "You must define an editor in either $TMUX_EDITOR or $EDITOR to use this command"
-    exit 1
+  c.option '--dir STRING', String, 'The directory to run the session in'
 
-  rescue Tlux::Config::FileNotFound 
-    puts "Tlux config file not found #{ARGV[0]}"
-    exit 1
+  c.action do |args, options|
+    options.default dir: Dir.pwd
+    config = args.shift || abort('config argument required')
+    Tlux::Commands::RunCommand.new(config, options.dir).run
+  end
+end
 
-  rescue Tlux::CommandNotFoundError
-    puts "Command not available"
-    exit 1
+command :list do |c|
+  c.syntax = 'tlux list'
 
+  c.action do |args, options|
+    puts Tlux::Commands::ListCommand.new.run
   end
-else
+end
 
-  puts <<-EOF
-Tlux version: #{Tlux::VERSION}
+command :open do |c|
+  c.syntax = 'tlux open <config>'
 
-Usage:
-  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
+  c.action do |args, options|
+    config = args.shift || abort('config argument required')
+    Tlux::Commands::OpenCommand.new(config).run
+  end
 end
 

data/lib/tlux.rb

@@ -5,7 +5,6 @@ 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"
@@ -15,5 +14,10 @@ require "tlux/session"
 require "tlux/window"
 require "tlux/pane"
 
-require "tlux/config"
-require "tlux/commands"
+require "tlux/config/generator"
+require "tlux/config/parser"
+
+require 'tlux/commands/base'
+require 'tlux/commands/list_command'
+require 'tlux/commands/run_command'
+require 'tlux/commands/open_command'

data/lib/tlux/commands/run_command.rb

@@ -4,26 +4,23 @@ module Tlux
   module Commands
     class RunCommand < Tlux::Commands::Base
 
-      attr_reader :config_name
+      attr_reader :config_name, :dir
 
-      def initialize(config_name)
+      def initialize(config_name, dir = '')
         @config_name = config_name
+        @dir = dir
       end
 
       def run
         parser = Tlux::Config::Parser.from_file(config_file_path)
         parser.parse!
-        parser.session.name = session_name
+        parser.session.dir = dir unless dir.empty?
 
         exec Tlux::Config::Generator.new(parser.session).generate!
       end
 
       private
 
-      def session_name
-        Pathname.new(Dir.pwd).basename.to_s.gsub(/\./, '-').gsub(/\:/, '-')
-      end
-
       def config_file_path
         File.join(config_path, config_name)
       end

data/lib/tlux/config/generator.rb

@@ -11,7 +11,7 @@ module Tlux
       def generate!
         name = session.name
         windows = session.windows
-        dir = Dir.pwd
+        dir = session.dir
 
         template.result(binding)
       end

data/lib/tlux/config/parser.rb

@@ -1,5 +1,7 @@
 module Tlux
   module Config
+    class FileNotFound < StandardError ; end
+
     class Parser
       def self.from_file(path)
         raise Tlux::Config::FileNotFound.new(path) unless File.exists?(path) && File.file?(path)

data/lib/tlux/session.rb

@@ -1,10 +1,12 @@
 module Tlux
   class Session
-    attr_accessor :name
+    attr_accessor :dir
     attr_reader :windows
+    attr_writer :name
 
     def initialize(name = "")
       @name = name
+      @dir = Dir.pwd
       @windows = []
     end
 
@@ -14,8 +16,18 @@ module Tlux
       window.instance_eval(&block) if block_given?
     end
 
+    def name
+      @name.empty? ? name_from_dir : @name
+    end
+
     def get_binding
       binding
     end
+
+    private
+
+    def name_from_dir
+      Pathname.new(dir).basename.to_s.gsub(/\./, '-').gsub(/\:/, '-')
+    end
   end
 end

data/lib/tlux/version.rb

@@ -1,3 +1,3 @@
 module Tlux
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/session_spec.rb

@@ -4,9 +4,33 @@ describe Tlux::Session do
   let(:session) { Tlux::Session.new }
 
   describe "#name" do
-    it "should have a name" do
-      session.name = "foo"
-      session.name.should == "foo"
+    context "default" do
+      before { Dir.stub!(:pwd).and_return('/path/to/project.js') }
+
+      subject { session.name }
+
+      it { should == "project-js" }
+    end
+
+    context "settable" do
+      it "should have a name" do
+        session.name = "foo"
+        session.name.should == "foo"
+      end
+    end
+  end
+
+  describe "#dir" do
+    before { Dir.stub!(:pwd).and_return(:pwd) }
+    subject { session }
+
+    context "default" do
+      its(:dir) { should == :pwd }
+    end
+
+    context "settable" do
+      before { session.dir = :foo }
+      its(:dir) { should == :foo }
     end
   end
 

data/tlux.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Tlux::VERSION
 
+  gem.add_dependency('commander')
+
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('rake')
   #gem.add_development_dependency('fakefs')

metadata

@@ -1,46 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: tlux
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Oliver Nightingale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !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
@@ -60,14 +69,10 @@ files:
 - bin/tlux
 - lib/tlux.rb
 - lib/tlux/commandable.rb
-- lib/tlux/commands.rb
 - lib/tlux/commands/base.rb
 - lib/tlux/commands/list_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
-- lib/tlux/config.rb
 - lib/tlux/config/generator.rb
 - lib/tlux/config/parser.rb
 - lib/tlux/pane.rb
@@ -78,10 +83,8 @@ 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/open_command_spec.rb
-- spec/commands/run_command_spec.rb
 - spec/config/generator_spec.rb
 - spec/config/parser_spec.rb
 - spec/fixtures/sample_config.rb
@@ -94,34 +97,31 @@ files:
 - tlux.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Luxurious tmux configuration
 test_files:
 - spec/commands/base_spec.rb
-- spec/commands/commands_spec.rb
 - spec/commands/list_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
 - spec/fixtures/sample_config.rb

data/lib/tlux/commands.rb

@@ -1,27 +0,0 @@
-module Tlux
-  module Commands
-    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
-
-require 'tlux/commands/base'
-require 'tlux/commands/list_command'
-require 'tlux/commands/run_command'
-require 'tlux/commands/open_command'

data/lib/tlux/commands/start.rb

@@ -1,13 +0,0 @@
-module Tlux
-  module Commands
-    class Start
-      def initialize(args)
-        @config_file = args.first
-      end
-
-      def run
-        puts @config_file
-      end
-    end
-  end
-end

data/lib/tlux/commands/start_command.rb

@@ -1,13 +0,0 @@
-module Tlux
-  module Commands
-    class Start
-      def initialize(args)
-        @config_file = args.first
-      end
-
-      def run
-        raise @config_file.inspect
-      end
-    end
-  end
-end

data/lib/tlux/config.rb

@@ -1,8 +0,0 @@
-module Tlux
-  module Config
-    class FileNotFound < StandardError ; end
-  end
-end
-
-require 'tlux/config/parser'
-require 'tlux/config/generator'

data/spec/commands/commands_spec.rb

@@ -1,28 +0,0 @@
-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/run_command_spec.rb

@@ -1,45 +0,0 @@
-#require 'spec_helper'
-#
-#describe Tlux::Commands::RunCommand do
-#  describe "#run" do
-#    before :each do
-#      FakeFS.activate!
-#    end
-#
-#    after :each do
-#      FakeFS.deactivate!
-#    end
-#
-#    let(:config_path) { File.join(Dir.home, '.tlux', 'test') }
-#    let(:current_dir) { Dir.pwd }
-#    let(:command) { Tlux::Commands::RunCommand.new(config_path, current_dir) }
-#
-#    context "config file does not exist" do
-#      it "should raise a Tlux::Config::FileNotFoundError" do
-#        expect {
-#          command.run
-#        }.to raise_error(Tlux::Config::FileNotFoundError)
-#      end
-#    end
-#
-#    context "config file does exist" do
-#      before :each do
-#        Tlux::Config::Parser.stub!(:new).with
-#      end
-#
-#      describe "parsing the config file" do
-#        it "should parse the config file" do
-#          parser.should_receive(:parse!)
-#        end
-#      end
-#
-#      it "should generate the tmux config for the tlux config file" do
-#
-#      end
-#
-#      it "should write the file out to tlux directory" do
-#
-#      end
-#    end
-#  end
-#end