tlux 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae09a41d10ba3b8694e8f2cbe719b1a36bdbf49f
-  data.tar.gz: 135fcfa7092d132d64cc1cbb98237554d961916e
+  metadata.gz: 0fe8fcc9f8b1a49b698dcb8f63c7cd91f12e4ff8
+  data.tar.gz: 804762cf108ff8b9f41123eed1a9041fffdf0f0a
 SHA512:
-  metadata.gz: a2c1fe25703bb9c5971fe0bb9579667f5011e33fece3349d81c3872adb03771cedf1580056ac755c9f97d42d3e0e91a99c746fb3937b8647907059446c549f04
-  data.tar.gz: 3a92d0621a6dc0b3f5a8afcd16510c5ea6ad1f9c2f6e26b4c7d29b451e4c5170767983ceca9c6acea581b2cb8bb6de3f3aac89b7a1db1c2329d829a388675cd8
+  metadata.gz: dc12d340479b2d3d80a69038ae661af2afc7f1a1468925c8407e0b5ef635dd8d1f6d76de3890c4f41fb61b15553acec354bc24858ba3344e37c968cf86ae9b39
+  data.tar.gz: 05b5e7abf9c48950c520ca76c016ba108e57aa9db4b73c9941d015d06da1bd683a930733423b318b2281ef3606f14afbe55227a4629b0678ab47a498356df77a

data/bin/tlux

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)

data/lib/tlux/version.rb

@@ -1,3 +1,3 @@
 module Tlux
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/commands/base_spec.rb

@@ -16,27 +16,26 @@ describe Tlux::Commands::Base do
       it "should create the tlux directory structure" do
         subject.setup
 
-        Dir.exists?(File.join(Dir.home, '.tlux')).should be_true
+        expect(Dir.exists? tlux_config_file).to eq true
       end
     end
 
     context "tlux directory already present" do
       before :each do
-        FileUtils.mkdir_p(File.join(Dir.home, '.tlux'))
-        FileUtils.touch(File.join(Dir.home, '.tlux', 'test'))
+        subject.setup
+        FileUtils.touch tlux_config_test_file
       end
 
       it "should not re-create the directory structure" do
         subject.setup
 
-        Dir.exists?(File.join(Dir.home, '.tlux')).should be_true
-        Dir.exists?(File.join(Dir.home, '.tlux')).should be_true
+        expect(Dir.exists? tlux_config_file).to eq true
       end
 
       it "should not loose the existing files" do
         subject.setup
 
-        File.exists?(File.join(Dir.home, '.tlux', 'test')).should be_true
+        expect(File.exists? tlux_config_test_file).to eq true
       end
     end
   end
@@ -45,7 +44,7 @@ describe Tlux::Commands::Base do
     subject { Tlux::Commands::Base.new }
 
     it "should return the path to the config files" do
-      subject.config_path.should == File.join(Dir.home, '.tlux')
+      expect(subject.config_path).to eq tlux_config_file
     end
   end
 end

data/spec/commands/list_command_spec.rb

@@ -16,7 +16,7 @@ describe Tlux::Commands::ListCommand do
     context "tlux dir not set up" do
       it "should set up the tlux dir" do
         subject.run
-        Dir.exists?(File.join(Dir.home, '.tlux')).should be_true
+        expect(Dir.exists?(File.join(Dir.home, '.tlux'))).to eq true
       end
     end
 
@@ -24,8 +24,8 @@ describe Tlux::Commands::ListCommand do
       let(:list) { subject.run }
 
       it "should return an empty array" do
-        list.should be_kind_of Array
-        list.should be_empty
+        expect(list).to be_kind_of Array
+        expect(list).to be_empty
       end
     end
 
@@ -38,7 +38,7 @@ describe Tlux::Commands::ListCommand do
       end
 
       it "should return an array with the name of the config" do
-        list.include?(config_name).should be_true
+        expect(list).to include config_name
       end
     end
 
@@ -54,7 +54,7 @@ describe Tlux::Commands::ListCommand do
 
       it "should return an array with all the names of the config" do
         config_names.each do |config_name|
-          list.include?(config_name).should be_true
+          expect(list).to include config_name
         end
       end
     end

data/spec/commands/open_command_spec.rb

@@ -19,13 +19,13 @@ describe Tlux::Commands::OpenCommand do
     context "tlux dir doesn't exist" do
       it "should create the tlux dir" do
         subject.run(false)
-        Dir.exists?(File.join(Dir.home, '.tlux')).should be_true
+        expect(Dir.exists? tlux_config_file).to eq true
       end
     end
 
     it "should create the config file" do
       subject.run(false)
-      File.exists?(File.join(Dir.home, '.tlux', config_name))
+      expect(File.exists? File.join(tlux_config_file, config_name)).to eq true
     end
   end
 end

data/spec/config/generator_spec.rb

@@ -6,7 +6,7 @@ describe Tlux::Config::Generator do
     subject { Tlux::Config::Generator.new(session) }
 
     it "should have a session" do
-      subject.session.should == session
+      expect(subject.session).to eq session
     end
   end
 

data/spec/config/parser_spec.rb

@@ -13,7 +13,7 @@ describe Tlux::Config::Parser do
     context "config file does exist" do
       it "should return a new instance of Tlux::Config::Parser" do
         parser = Tlux::Config::Parser.from_file(File.join('spec', 'fixtures', 'sample_config.rb'))
-        parser.should be_kind_of(Tlux::Config::Parser)
+        expect(parser).to be_kind_of Tlux::Config::Parser
       end
     end
   end
@@ -23,11 +23,11 @@ describe Tlux::Config::Parser do
     subject { Tlux::Config::Parser.new config }
 
     it "should have a config string" do
-      subject.config.should == config
+      expect(subject.config).to eq config
     end
 
     it "should have a new session object" do
-      subject.session.should be_kind_of Tlux::Session
+      expect(subject.session).to be_kind_of Tlux::Session
     end
   end
 
@@ -37,11 +37,11 @@ describe Tlux::Config::Parser do
     subject { Tlux::Config::Parser.new config }
 
     before :each do
-      Tlux::Session.stub(:new).and_return(session)
+      allow(Tlux::Session).to receive(:new).and_return(session)
     end
 
     it "should instance eval the config with the new session" do
-      session.should_receive(:instance_eval).with(config)
+      allow(session).to receive(:instance_eval).with(config)
       subject.parse!
     end
   end

data/spec/pane_spec.rb

@@ -14,7 +14,7 @@ describe Tlux::Pane do
       subject { Tlux::Pane.new(:vertical) }
 
       it "should be v" do
-        subject.orientation.should == '-v'
+        expect(subject.orientation).to eq '-v'
       end
     end
 
@@ -22,7 +22,7 @@ describe Tlux::Pane do
       subject { Tlux::Pane.new(:horizontal) }
 
       it "should be h" do
-        subject.orientation.should == '-h'
+        expect(subject.orientation).to eq '-h'
       end
     end
 
@@ -30,7 +30,7 @@ describe Tlux::Pane do
       subject { Tlux::Pane.new }
 
       it "should be v" do
-        subject.orientation.should == '-v'
+        expect(subject.orientation).to eq '-v'
       end
     end
   end
@@ -40,7 +40,7 @@ describe Tlux::Pane do
       subject { Tlux::Pane.new }
 
       it "should be nil" do
-        subject.size.should be_nil
+        expect(subject.size).to be_nil
       end
     end
 
@@ -48,7 +48,7 @@ describe Tlux::Pane do
       subject { Tlux::Pane.new(:vertical, lines: 20) }
 
       it "should be -l 20" do
-        subject.size.should == "-l 20"
+        expect(subject.size).to eq "-l 20"
       end
     end
 
@@ -56,7 +56,7 @@ describe Tlux::Pane do
       subject { Tlux::Pane.new(:vertical, percentage: 20) }
 
       it "should be -p 20" do
-        subject.size.should == "-p 20"
+        expect(subject.size).to eq "-p 20"
       end
     end
   end

data/spec/session_spec.rb

@@ -5,32 +5,39 @@ describe Tlux::Session do
 
   describe "#name" do
     context "default" do
-      before { Dir.stub(:pwd).and_return('/path/to/project.js') }
+      before { allow(Dir).to receive(:pwd).and_return('/path/to/project.js') }
 
       subject { session.name }
 
-      it { should == "project-js" }
+      it 'should have the correct project name' do
+        expect(subject).to eq 'project-js'
+      end
     end
 
     context "settable" do
       it "should have a name" do
         session.name("foo")
-        session.name.should == "foo"
+        expect(session.name).to eq 'foo'
       end
     end
   end
 
   describe "#dir" do
-    before { Dir.stub(:pwd).and_return(:pwd) }
+    before { allow(Dir).to receive(:pwd).and_return(:pwd) }
     subject { session }
 
     context "default" do
-      its(:dir) { should == :pwd }
+      it 'should return the correct working directory' do
+        expect(subject.dir).to eq :pwd
+      end
     end
 
     context "settable" do
       before { session.dir(:foo) }
-      its(:dir) { should == :foo }
+
+      it 'should be settable' do
+        expect(subject.dir).to eq :foo
+      end
     end
   end
 
@@ -39,7 +46,7 @@ describe Tlux::Session do
     let(:opts) { {:baz => true} }
 
     it "should create a new window" do
-      Tlux::Window.should_receive(:new).with(name, opts)
+      allow(Tlux::Window).to receive(:new).with(name, opts)
       session.window name, opts
     end
 
@@ -56,8 +63,8 @@ describe Tlux::Session do
         window = self
       end
 
-      window.should be_kind_of(Tlux::Window)
-      window.name.should == "foo"
+      expect(window).to be_kind_of Tlux::Window
+      expect(window.name).to eq 'foo'
     end
   end
 end

data/spec/spec_helper.rb

@@ -16,7 +16,6 @@ Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
 end
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -34,3 +33,19 @@ def empty_tlux_dir!
     Dir.foreach(path) { |filename| File.delete(File.join(path, filename)) if File.exists?(File.join(path, filename)) }
   end
 end
+
+def tlux_generated_dir
+  File.join(Dir.home, '.tlux', 'generated')
+end
+
+def tlux_generated_file(file_name)
+  File.join(tlux_generated_dir, file_name)
+end
+
+def tlux_config_file
+  File.join(Dir.home, '.tlux')
+end
+
+def tlux_config_test_file
+  File.join(tlux_config_file, 'test')
+end

data/spec/support/commandable.rb

@@ -12,7 +12,7 @@ shared_examples_for Tlux::Commandable do
 
     it "should set the directory" do
       commandable.directory dir
-      commandable.directory.should == dir
+      expect(commandable.directory).to eq dir
     end
   end
 end

data/spec/support/splitable.rb

@@ -5,7 +5,7 @@ shared_examples_for Tlux::Splitable do
 
     it "should create a new pane" do
       splitable.split(orientation, opts)
-      splitable.panes.first.should be_kind_of Tlux::Pane
+      expect(splitable.panes.first).to be_kind_of Tlux::Pane
     end
 
     it "should add the new pane to the list of panes" do
@@ -21,8 +21,8 @@ shared_examples_for Tlux::Splitable do
         pane = self
       end
 
-      pane.should be_kind_of(Tlux::Pane)
-      pane.orientation.should_not be_nil
+      expect(pane).to be_kind_of Tlux::Pane
+      expect(pane.orientation).to_not be_nil
     end
   end
 end

data/spec/window_spec.rb

@@ -13,7 +13,7 @@ describe Tlux::Window do
     subject { Tlux::Window.new("foo") }
 
     it "should have a name" do
-      subject.name.should == "foo"
+      expect(subject.name).to eq 'foo'
     end
   end
 end

data/tlux.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('commander')
 
-  gem.add_development_dependency('rspec')
+  gem.add_development_dependency('rspec', '~>3.0.0')
   gem.add_development_dependency('rake')
   #gem.add_development_dependency('fakefs')
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: tlux
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Oliver Nightingale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2014-12-01 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
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Luxurious tmux configuration
@@ -60,8 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.md
@@ -104,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Luxurious tmux configuration