terminitor 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    terminitor (0.0.5)
-      github
+    terminitor (0.2.1)
+      github (~> 0.4.5)
       rb-appscript
       thor (~> 0.14.0)
 
@@ -10,7 +10,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     fakefs (0.2.1)
-    github (0.4.3)
+    github (0.4.5)
       highline (~> 1.5.1)
       json (>= 1.2.0)
       text-format (>= 1.0.0)
@@ -25,7 +25,7 @@ GEM
     text-format (1.0.0)
       text-hyphen (~> 1.0.0)
     text-hyphen (1.0.0)
-    thor (0.14.1)
+    thor (0.14.4)
 
 PLATFORMS
   ruby
@@ -33,9 +33,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   fakefs
-  github
+  github (~> 0.4.5)
   rb-appscript
   riot (~> 0.11.0)
-  rr
+  rr (= 1.0.0)
   terminitor!
   thor (~> 0.14.0)

data/lib/terminitor/version.rb

@@ -1,3 +1,3 @@
 module Terminitor
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/terminitor/yaml.rb

@@ -12,8 +12,12 @@ module Terminitor
     
     # Returns yaml file as Terminitor formmatted hash
     def to_hash
-      combined = @file.inject({}) {|base, item| base.merge!(item) ; base } # merge the array of hashes.
-      { :setup => nil, :windows => { 'default' => combined } }
+      combined = @file.inject({}) do |base, item| 
+        item = {item.keys.first => {:commands => item.values.first, :options => {}}}
+        base.merge!(item)
+        base
+      end # merge the array of hashes.
+       { :setup => nil, :windows => { 'default' => {:tabs => combined} } }
     end
 
   end

data/terminitor.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |s|
   else
   end
   
-  s.add_dependency "thor", "~>0.14.0"
-  s.add_dependency "github"
+  s.add_dependency "thor",   "~>0.14.0"
+  s.add_dependency "github", "~>0.4.5"
   s.add_development_dependency "bundler", "~>1.0.0"
-  s.add_development_dependency "riot", "~>0.11.0"
-  s.add_development_dependency "rr"
+  s.add_development_dependency "riot",    "~>0.11.0"
+  s.add_development_dependency "rr",      "=1.0.0"
   s.add_development_dependency "fakefs"
   s.post_install_message = %q{********************************************************************************
 

data/test/yaml_test.rb

@@ -7,7 +7,12 @@ context "Yaml" do
   
   context "to_hash" do
     setup { @yaml.to_hash }
-    asserts_topic.equivalent_to({ :setup => nil, :windows => {'default' => {'tab1' => ['cd /foo/bar','gitx'], 'tab2' => ['ls','mate .']}}})
+    asserts_topic.equivalent_to :setup => nil, 
+      :windows => {'default' => {:tabs => {'tab1' => { :commands => ['cd /foo/bar','gitx'], :options => {}}, 
+                                           'tab2' => { :commands => ['ls','mate .'], :options => {}}
+                                           }
+                                 }
+                  }
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terminitor
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -08:00
+date: 2010-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,12 +55,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 5
+        version: 0.4.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -101,12 +103,14 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 0
+        version: 1.0.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency