termrc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d06e86ff71c380bb240d0d2f60a64cc71a3775f
-  data.tar.gz: 25e8812bffe0288f4a46e10a1b8941eec36cee9d
+  metadata.gz: 9fcb14299cfde27760c6dfa122bda333155246e1
+  data.tar.gz: e453a10c68003872229394eaef5d654dc37f259e
 SHA512:
-  metadata.gz: 8c2b0a2c8053326bcd400d0e921494244fcab4e5e29e130fb5685c9e95d0c685c6587bd241973d4bf89160e5cfe16c48bcc19d9724e5d626436dd60ebd01e24f
-  data.tar.gz: b411d51211d9a4372568aff51c56dd7d4eaff1a47f9b7023db934408ea3d6024131193626310298e78c864565b39d6a682d4e7c710e1de5c8dd24331b2596104
+  metadata.gz: 688a2d7b691bdff513ac81b37fd7e7bc2a31530cffe8e172f0a836df2e1e939110b09d58809447bfaea21ba3202c6725dd5be1d56b77eca4f66c0314b5931b74
+  data.tar.gz: ab8cfa03d40e366e8570ff25c49dc965e63c4b5dbf28f32c0b20b59eb2e6a7e4eea41b11987addae0766d42e035b0baeff12c374ca04b362dc28e9e3aebe8259

data/README.md

@@ -4,23 +4,24 @@ Take your [iTerm2](http://www.iterm2.com/) environments with you wherever you go
 
 Description
 -----------
-Termrc allows you to store information about your project's environment for a given project in a small YAML file called a `.termrc` file. Restoring your project's environment is as simple as calling `termrc start`. Enjoy.
+Termrc allows you to store information about your project's environment for a given project in a small YAML file called a `Termfile` file. Restoring your project's environment is as simple as calling `termrc start`. Enjoy.
 
 Quick Start
 -----------
 ```bash
 $ gem install termrc
-$ termrc create 
+$ termrc create
 $ termrc start
 ```
 
 .termrc file
 ----------
-The `.termrc` file is a [YAML](http://en.wikipedia.org/wiki/YAML) file which stores information about your project's environment. An environment, in this context, is an iTerm2 window with various panes, each with a different default command that is run when the pane opens. The `layout` dictates what your window looks like, while `commands` gives you a set of commands you can call for each pane. 
+The `Termfile` file is a [YAML](http://en.wikipedia.org/wiki/YAML) file which stores information about your project's environment. An environment, in this context, is an iTerm2 window with various panes, each with a different default command that is run when the pane opens. The `layout` dictates what your window looks like, while `commands` gives you a set of commands you can call for each pane.
 
-Place the `.termrc file` at your project's root, then call `termrc start`. Voila!
+Place the `Termfile` file at your project's root, then call `termrc start`. Voila!
+
+**Example Termfile**
 
-**Example .termrc**
 ```yaml
 commands:
   here:       echo "Hello, here."
@@ -33,24 +34,26 @@ layout:
   - [ here, there ]       # row 1, with 2 panes
   - [ world ]             # row 2, with 1 pane
   - [ me, you ]           # row 3, with 2 panes
-``` 
+```
 
 **The Result**
-A `.termrc` file is a YAML file which requires two keys: `commands` and a `layout`. Each item in `layout` corresponds to a row of panes in iTerm2. So, for instance, the example `.termrc` file above would produce a new iTerm2 window with the following commands running inside each pane:
+
+A `Termfile` file is a YAML file which requires two keys: `commands` and a `layout`. Each item in `layout` corresponds to a row of panes in iTerm2. So, for instance, the example `Termfile` file above would produce a new iTerm2 window with the following commands running inside each pane:
 
 <img src="https://rawgithub.com/briangonzalez/termrc/master/images/termrc-screen.png">
 
-You can supply an optional third key, `root`, which indicates the root directory you'd like each command to be run inside of. Have a look at [this project's](https://github.com/briangonzalez/termrc/blob/master/.termrc)`.termrc` file for an example.
+You can supply an optional third key, `root`, which indicates the root directory you'd like each command to be run inside of. Have a look at [this project's](https://github.com/briangonzalez/termrc/blob/master/Termfile.test)`Termfile` file for an example.
 
-** Tabs **
-You can automate tabs by providing an array of arrays, each array denoting a new tab and the layout within it. See [this template file]() for an example. 
+**Tabs**
+
+You can automate tabs by providing an array of arrays, each array denoting a new tab and the layout within it. See [this template file](https://github.com/briangonzalez/termrc/blob/master/lib/template/termrc_with_tabs.template) for an example.
 
 CLI
 ---
 
 ```bash
 $ termrc start      # Start termrc file (Shortcut: s, Argument 0: file (optional) )
-$ termrc create     # Create termrc file       
+$ termrc create     # Create termrc file
 $ termrc list       # List termrc files in folder (Shortcut: l, Argument 0: folder (optional))
 ```
 
@@ -61,7 +64,13 @@ Released under the MIT License.
 
 Questions?
 ----------
-Find me on [Twitter](http://twitter.com/brianmgonzalez).
+| ![twitter/brianmgonzalez](http://gravatar.com/avatar/f6363fe1d9aadb1c3f07ba7867f0e854?s=70](http://twitter.com/brianmgonzalez "Follow @brianmgonzalez on Twitter") |
+|---|
+| [Brian Gonzalez](http://briangonzalez.org) |
+
+Changelog
+---------
+* March 19, 2014 - Now using `Termfile`; panes now named with given command
 
 Resources
 ---------

data/Termfile.test

@@ -0,0 +1,11 @@
+
+root:
+  ~/code/github/termrc-gem
+
+commands:
+  git_status:       git status
+  rake:             rake -T
+
+layout:
+  - [ git_status ]
+  - [ rake ]

data/lib/termrc/builder.rb

@@ -30,7 +30,7 @@ module Termrc
     def applescript_files
       if tabs?
         return @layout.each_with_index.map{ |layout_array, index|
-          applescript_file(layout_array, index) 
+          applescript_file(layout_array, index)
         }
       else
         return [ applescript_file(@layout, 0) ]
@@ -39,16 +39,16 @@ module Termrc
 
     def applescript_file(layout_array, index)
       t = TEMPLATE
-           
+
       if index > 0
         # All other tabs.
         t = t.gsub("[window_or_tab]",     new_tab)
-        t = t.gsub("[session]",           current_session)     
+        t = t.gsub("[session]",           current_session)
         t = t.gsub("[terminate_unused]", terminate_session('last'))
       else
         # First tab.
         t = t.gsub("[window_or_tab]",     new_window)
-        t = t.gsub("[session]",           new_session)     
+        t = t.gsub("[session]",           new_session)
         t = t.gsub("[terminate_unused]",  terminate_session)
       end
 
@@ -70,7 +70,7 @@ module Termrc
     def panes(layout_array)
       cmd =   next_pane     # back to the top
       cmd =   next_pane     # back to the top
-      
+
       layout_array.each do |cmds|
         cmd << Array.new( cmds.length - 1, new_column ).join("\n")
         cmd << next_pane
@@ -85,10 +85,10 @@ module Termrc
 
       layout_array.each do |commands|
         commands.each do |name|
-          cmd << execute_command( @cmd_index, @commands[name] )
+          cmd << execute_command( @cmd_index, @commands[name], name )
           @cmd_index += 1
         end
-      end  
+      end
 
       cmd
     end
@@ -131,22 +131,25 @@ module Termrc
     end
 
     def new_session
-      "set mysession to (make new session at the end of sessions) "
+      "set mysession to (make new session at the end of sessions)"
     end
 
     def current_session
-      "set mysession to (current session) "
+      "set mysession to (current session)"
     end
 
     def terminate_session(which='first')
       "terminate the #{which} session"
     end
 
-    def execute_command(item, command)
+    def execute_command(item, command, name)
       command = command.gsub('"', '\\"')
       command = command.gsub("'", "\\'")
       command = "cd #{@root} && " + command if @root
-      "tell item #{item} of sessions to write text \"#{command}\" \n"
+      <<-EOH
+        tell item #{item} of sessions to set name to "#{name}" \n
+        tell item #{item} of sessions to write text \"#{command}\" \n
+      EOH
     end
 
     def keystroke(key, using="")

data/lib/termrc/cli.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 
 module Termrc
 
-  TERMRC_TEMPLATE = File.join( File.expand_path('../..', __FILE__), 'template', 'termrc_base.template' )
+  TERMRC_TEMPLATE = File.join( File.expand_path('../..', __FILE__), 'template', 'termfile.template' )
 
   class Cli < Thor
     include Thor::Actions
@@ -12,44 +12,56 @@ module Termrc
     map 'l' => :list
     map 's' => :start
 
-    desc 'create', 'Create termrc file (Shortcut: c)'
+    desc 'create', 'Create Termfile (Shortcut: c)'
     def create
-
-      if File.exist? '.termrc'
-        raise Thor::Error.new "Error: '.termrc' already exists!"
+      if (File.exist? '.termrc' or File.exists? 'Termfile')
+        say_this "Error: 'Termfile' already exists!"
+        return
       else
-        say "Creating .termrc file..", :yellow
-        FileUtils.cp TERMRC_TEMPLATE, '.termrc'
-
-        say "Success! \n\n", :yellow
+        say_this "Creating Termfile...", :yellow
+        FileUtils.cp TERMRC_TEMPLATE, 'Termfile'
 
-        say "Now run your new termrc file by calling `termrc start`", :blue
+        say_this "Success! \n", :yellow
+        say_this "Now run your new Termfile file by calling `termrc start`", :blue
       end
     end
 
-    desc 'list', 'List termrc files in folder (Shortcut: l, Argument 0: folder (optional))'
+    desc 'list', 'List Termfiles in folder (Shortcut: l, Argument 0: folder (optional))'
     def list(folder='.')
       folder_description = folder == "." ? 'current folder' : "'#{folder}'"
-      say "Looking for termrc files in #{folder_description}:", :yellow
-      
-      a = `find #{folder} | grep -w \.termrc$`
-      say a
+      say_this "Looking for termrc files in #{folder_description}:", :yellow
 
-      say "None found.", :red if a.length < 1
+      a = `find #{folder} -name ".termrc" -o -name "Termfile"`
+      say_this a
+
+      say_this "None found.", :red if a.length < 1
     end
 
     desc 'start', 'Start termrc file (Shortcut: s, Argument 0: file (optional) )'
-    def start(file=false)
-      file = file || '.termrc'
-      raise Thor::Error.new "File '#{file}'' does not exist!" unless File.exist? file
+    def start(file='Termfile')
+      file = '.termrc' unless File.exists?(file)
+
+      if !File.exist? file
+        say_this "Could not find Termfile! Did you run `termrc create`?", :red
+        say_this "Did you run `termrc init`?", :yellow
+        return
+      elsif file == '.termrc'
+        say_this "Using deprecated #{file} file...", :yellow
+      end
 
-      say "Starting termrc file: '#{file}'.", :yellow
-      say "[ Please wait until fully launched! ]", :red
+      say_this "Starting termrc using: '#{file}'", :blue
+      say_this "Please wait until all panes have fully launched!", :red
       begin
         Termrc::Base.new( File.expand_path(file) )
       rescue Exception => e
-        say "\nError while starting termrc file:", :red
-        puts e
+        say_this "Error while starting termrc:", :red
+        say_this e.to_s
+      end
+    end
+
+    no_commands do
+      def say_this(text="", color=:white)
+        say "** " + (text || ''), color
       end
     end
 

data/termrc.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.executables   << 'termrc'
   gem.name          = "termrc"
-  gem.version       = '0.2.0'
+  gem.version       = '0.2.1'
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'thor', '~> 0.18.0'
+  gem.add_runtime_dependency 'thor', '~> 0.18.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termrc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Brian Gonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.18.1
 description: Take your iTerm2 environments with you wherever you go.
 email:
 - me@briangonzalez.org
@@ -33,13 +33,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .termrc
 - README.md
 - Rakefile
+- Termfile.test
 - bin/termrc
 - lib/template/run.osascript
-- lib/template/termrc_base.template
-- lib/template/termrc_with_tabs.template
+- lib/template/termfile.template
+- lib/template/termfile_with_tabs.template
 - lib/termrc.rb
 - lib/termrc/base.rb
 - lib/termrc/builder.rb
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Take your iTerm2 environments with you wherever you go.

data/.termrc

@@ -1,11 +0,0 @@
-
-root:       
-  ~/code/github/termrc-gem
-
-commands:
-  gs:       git status
-  rake:     rake -T
-
-layout:
-  - [ gs ]
-  - [ rake ]