reservoir 0.1.0 → 0.1.1

data/examples/rails_server.yml

@@ -1,6 +1,6 @@
-version: 0.1.0
+version: 0.1.1
 display:
-  filename: @@SERVER_NAME@@.reservoir
+  filename: @@SERVER_NAME@@
   mode: data_only
 remotes:
   - user: deployer

data/lib/reservoir/application.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 module Reservoir
   
   class Application
@@ -89,6 +91,7 @@ module Reservoir
       if @display == :stdio
         STDOUT.puts output
       elsif is_file?
+        system("mkdir -p #{Pathname.new(@display[:filename]).parent}")
         open(@display[:filename], 'a+') { |f| f.puts(output) }
       else
         output

data/lib/reservoir/version.rb

@@ -1,6 +1,6 @@
 module Reservoir
   
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   
   class Version
     

data/spec/application_spec.rb

@@ -23,14 +23,20 @@ module Reservoir
       Caller.stub!(:exec).with("node -version").and_return("")      
       Caller.stub!(:exec).with("ssh aforward@a4word.com 'ruby --version'").and_return("1.2.6")
 
-      File.delete("output.txt") if File.exist?("output.txt")
-      File.delete("a4word.com.reservoir") if File.exist?("a4word.com.reservoir")
+      cleanup
     end
     
     after(:all) do
+      cleanup
+    end
+
+    def cleanup
       File.delete("output.txt") if File.exist?("output.txt")
+      File.delete("a4word.com") if File.exist?("a4word.com")
+      system("rm -rf ./tmp")
     end
     
+    
     describe "#run" do
       
       describe "no args" do
@@ -102,20 +108,19 @@ module Reservoir
     
         it "should save files to disk" do
           @application.run([@project_file,@project_file2])
-          File.exists?("a4word.com.reservoir").should == true
+          File.exists?("a4word.com").should == true
         end
     
     
         it "should clean up existing files" do
-          open("a4word.com.reservoir", 'a+') { |f| f.puts("garble") }
+          open("a4word.com", 'a+') { |f| f.puts("garble") }
           @application.run([@project_file,@project_file2])
-          IO.read("a4word.com.reservoir").should == "reservoir, version 0.1.0\nserver: aforward@a4word.com\nfile: /Users/aforward/tp/projects/cenx/reservoir/spec/sample_project2.yml\nruby : 1.2.6 : /path/to/a4word/ruby\n"
+          IO.read("a4word.com").should == "reservoir, version 0.1.1\nserver: aforward@a4word.com\nfile: /Users/aforward/tp/projects/cenx/reservoir/spec/sample_project2.yml\nruby : 1.2.6 : /path/to/a4word/ruby\n"
         end
     
         it "should support mode: data_only" do
-          open("a4word.com.reservoir", 'a+') { |f| f.puts("garble") }
           @application.run([@project_file3])
-          IO.read("a4word.com.reservoir").should == "reservoir, version 0.1.0\nruby : 1.2.6 : /path/to/a4word/ruby\n"
+          IO.read("./tmp/moretmp/a4word.com").should == "reservoir, version 0.1.1\nruby : 1.2.6 : /path/to/a4word/ruby\n"
         end
         
       end
@@ -147,7 +152,7 @@ module Reservoir
     describe "#messages" do
       
       it "should version_message" do
-        @application.version_message.should == "reservoir, version 0.1.0\n"
+        @application.version_message.should == "reservoir, version 0.1.1\n"
       end
     
       it "should usage_message" do

data/spec/project_spec.rb

@@ -64,7 +64,7 @@ module Reservoir
             t = project.template(clazz)
             t.remote_user.should == 'aforward'
             t.remote_server.should == 'a4word.com'
-            project.display.should == { :filename => "a4word.com.reservoir" }
+            project.display.should == { :filename => "a4word.com" }
           end
 
           it "should ignore remote data if not set" do

data/spec/sample_project.yml

@@ -1,4 +1,4 @@
-version: 0.1.0
+version: 0.1.1
 display: string
 scripts:
   - name: ruby

data/spec/sample_project2.yml

@@ -1,6 +1,6 @@
-version: 0.1.0
+version: 0.1.1
 display: 
-  filename: @@SERVER_NAME@@.reservoir
+  filename: @@SERVER_NAME@@
 remotes:
   - user: aforward
     server: a4word.com

data/spec/sample_project3.yml

@@ -1,6 +1,6 @@
-version: 0.1.0
+version: 0.1.1
 display: 
-  filename: @@SERVER_NAME@@.reservoir
+  filename: ./tmp/moretmp/@@SERVER_NAME@@
   mode: data_only
 remotes:
   - user: aforward

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reservoir
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-09-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70307851600340 !ruby/object:Gem::Requirement
+  requirement: &2156756840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307851600340
+  version_requirements: *2156756840
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70307851599920 !ruby/object:Gem::Requirement
+  requirement: &2156756420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307851599920
+  version_requirements: *2156756420
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70307851599460 !ruby/object:Gem::Requirement
+  requirement: &2156755960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307851599460
+  version_requirements: *2156755960
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70307851599040 !ruby/object:Gem::Requirement
+  requirement: &2156755540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307851599040
+  version_requirements: *2156755540
 description: Helps manage cloud-based server instances by enumerating, comparing and
   diff'ing application configurations
 email:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: reservoir
-rubygems_version: 1.8.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: What apps, versions and configurations to you have setup on your server