reservoir 0.0.4 → 0.1.0

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+sample.yml

data/examples/rails_server.yml

@@ -1,9 +1,10 @@
-version: 0.0.4
-# remotes:
-#   - user: deployer
-#     server: a4word.com
-#   - user:
-#     server:
+version: 0.1.0
+display:
+  filename: @@SERVER_NAME@@.reservoir
+  mode: data_only
+remotes:
+  - user: deployer
+    server: a4word.com
 scripts:
   - name: ruby
   - name: rvm

data/lib/reservoir/application.rb

@@ -2,17 +2,21 @@ module Reservoir
   
   class Application
     
-    attr_accessor :print_mode
+    attr_accessor :display
     
     def initialize(data = {})
-      @print_mode = data[:print_mode] || :stdio
+      @display = data[:display] || :stdio
+      @file_resets = []
+      @version_displayed_already = false
     end
     
-    def print_mode=(val)
-      @print_mode = val || :stdio
+    def display=(val)
+      @display = val || :stdio
     end
     
-    def welcome_message
+    def version_message
+      return nil if @version_displayed_already
+      @version_displayed_already = true
       print "reservoir, version #{Reservoir::VERSION}\n"
     end
     
@@ -25,7 +29,7 @@ module Reservoir
     end
     
     def project_message(project)
-      print "\n===\nLoading Project: #{project.name} [#{project.file}]\n===\n"
+      print "server: #{project.name}\nfile: #{project.file}\n"
     end
     
     def which_version_message(script,version,path)
@@ -39,14 +43,14 @@ module Reservoir
         usage_message
         return
       end
-      
-      welcome_message
 
       if ["--version","-version","-v","--v","version"].include?(args[0])
+        version_message
         return
       end
       
       if ["--help","-help","-h","--h","help"].include?(args[0])
+        version_message
         usage_message
         return
       end
@@ -55,8 +59,10 @@ module Reservoir
         args.each do |filename|
           all_projects = Project.load_from_file(filename)
           all_projects.each do |p|
-            print_mode = p.output
-            project_message(p)
+            self.display = p.display
+            self.flush
+            version_message
+            project_message(p) unless is_data_only?
             p.scripts.each do |script|
               which_script = p.template(WhichScript)
               version = p.template(Version)
@@ -69,18 +75,35 @@ module Reservoir
       rescue
         exception_message($!)
       end
-      print ""
+    end
+
+    def flush
+      return if @file_resets.include?(display)
+      return unless is_file?
+      @version_displayed_already = false
+      @file_resets<< display
+      File.delete(@display[:filename]) if File.exist?(@display[:filename])
     end
 
     def print(output)
-      if @print_mode == :stdio
+      if @display == :stdio
         STDOUT.puts output
-      elsif @print_mode.kind_of?(Hash) && !@print_mode[:file].nil?
-        open(@print_mode[:file], 'a') { |f| f.puts(output) }
+      elsif is_file?
+        open(@display[:filename], 'a+') { |f| f.puts(output) }
       else
         output
       end
     end
+    
+    private
+    
+      def is_file?
+        @display.kind_of?(Hash) && !@display[:filename].nil?
+      end
+      
+      def is_data_only?
+        @display.kind_of?(Hash) && @display[:mode] == "data_only"
+      end
 
   end
   

data/lib/reservoir/project.rb

@@ -2,27 +2,26 @@ module Reservoir
   
   class Project
     
-    attr_accessor :scripts, :file, :remote_user, :remote_server, :output
+    attr_accessor :scripts, :file, :remote_user, :remote_server, :display
     
     def initialize(data = {})
       @file = data[:file]
       @remote_user = data[:remote_user]
       @remote_server = data[:remote_server]
       @scripts = data[:scripts] || []
-      @output = data[:output]
+      @display = Project.sym_entries(data[:display]) || :stdio
     end
     
     def self.load_from_file(file)
       options = YAML::load( File.open( file ) )
-      default_args = { file: file, scripts: options["scripts"].each.collect { |script| script["name"] }, output: options["output"] }
-      
+      default_args = { file: file, scripts: options["scripts"].each.collect { |script| script["name"] }, display: sym_entries(options["display"]) }
       all_projects = []
       all_servers = options["remotes"]
       if all_servers.nil?
         all_projects << Project.new(default_args)
       else
         all_servers.each do |remote|
-          all_projects << Project.new(default_args.merge( remote_user: remote["user"], remote_server: remote["server"], output: resolve_placeholders(default_args[:output],remote)))
+          all_projects << Project.new(default_args.merge( remote_user: remote["user"], remote_server: remote["server"], display: resolve_placeholders(default_args[:display],remote)))
         end
       end
       all_projects
@@ -39,11 +38,20 @@ module Reservoir
     end
     
     private
-    
+
+      def self.sym_entries(var)
+        return var if var.nil? || var.kind_of?(Symbol)
+        return var.to_sym if var.kind_of?(String)
+        results = {}
+        var.each { |key,val| results[key.to_sym] = val }
+        results
+      end
+      
       def self.resolve_placeholders(var,remote)
         return var if var.nil?
-        var = var.gsub("@@SERVER_NAME@@",remote["server"])
-        var
+        results = {}
+        var.each { |key,val| results[key.to_sym] = val.gsub("@@SERVER_NAME@@",remote["server"])  }
+        results
       end
     
   end

data/lib/reservoir/version.rb

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

data/spec/application_spec.rb

@@ -7,8 +7,10 @@ module Reservoir
     before (:each) do
       @project_file = File.dirname(__FILE__) + '/sample_project.yml'
       @project_file2 = File.dirname(__FILE__) + '/sample_project2.yml'
+      @project_file3 = File.dirname(__FILE__) + '/sample_project3.yml'
+
       @application = Application.new
-      @application.print_mode = :string
+      @application.display = :string
 
       Caller.stub!(:exec).with("which ruby").and_return("/path/to/ruby")
       Caller.stub!(:exec).with("which rvm").and_return("/path/to/rvm")
@@ -32,12 +34,12 @@ module Reservoir
     describe "#run" do
       
       describe "no args" do
-
+    
         it "should handle nil args" do
           @application.should_receive(:usage_message)
           @application.run(nil)
         end
-
+    
         it "should handle empty args" do
           @application.should_receive(:usage_message)
           @application.run([])
@@ -46,22 +48,22 @@ module Reservoir
       end
       
       describe "help" do
-
+    
         ["--help","-help","-h","--h","help"].each do |help_name|
           it "should support --help" do
-            @application.should_receive(:welcome_message)
+            @application.should_receive(:version_message)
             @application.should_receive(:usage_message)
             @application.run([help_name])
           end
         end
-
+    
       end
       
       describe "version" do
-
+    
         ["--version","-version","-v","--v","version"].each do |help_name|
           it "should support --help" do
-            @application.should_receive(:welcome_message)
+            @application.should_receive(:version_message)
             @application.should_not_receive(:exception_message)
             @application.run([help_name])
           end
@@ -72,7 +74,6 @@ module Reservoir
       describe "invalid project file" do
         
         it "should fail gracefully" do
-          @application.should_receive(:welcome_message)
           @application.should_receive(:exception_message)
           @application.run(["blah.yml"])
         end
@@ -80,9 +81,9 @@ module Reservoir
       end
       
       describe "valid project files" do
-
+    
         it "should handle one file" do
-          @application.should_receive(:welcome_message)
+          @application.should_receive(:version_message)
           @application.should_receive(:project_message)
           @application.should_receive(:which_version_message).with("ruby","1.2.3","/path/to/ruby")
           @application.should_receive(:which_version_message).with("rvm","1.2.4","/path/to/rvm")
@@ -90,55 +91,72 @@ module Reservoir
           @application.should_not_receive(:exception_message)
           @application.run([@project_file])
         end
-
+    
         it "should handle multiple file" do
-          @application.should_receive(:welcome_message)
+          @application.should_receive(:version_message).exactly(2).times
           @application.should_receive(:project_message).exactly(2).times
           @application.should_receive(:which_version_message).exactly(4).times
           @application.should_not_receive(:exception_message)
           @application.run([@project_file,@project_file2])
-          File.exists?("a4word.com.reservoir")
+        end
+    
+        it "should save files to disk" do
+          @application.run([@project_file,@project_file2])
+          File.exists?("a4word.com.reservoir").should == true
+        end
+    
+    
+        it "should clean up existing files" do
+          open("a4word.com.reservoir", '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"
+        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"
         end
         
       end
       
     end
-
-    describe "#print_mode" do
+    
+    describe "#display" do
       
       it "should be settable" do
-        @application.print_mode = :a
-        @application.print_mode.should == :a
+        @application.display = :a
+        @application.display.should == :a
       end
       
       it "should default to stdio" do
-        @application.print_mode = nil
-        @application.print_mode.should == :stdio
+        @application.display = nil
+        @application.display.should == :stdio
       end
       
       it "should default to :stdio" do
-        Application.new.print_mode.should == :stdio
+        Application.new.display.should == :stdio
       end
       
       it "should be settable in constructor" do
-        Application.new(print_mode: :blah).print_mode.should == :blah
+        Application.new(display: :blah).display.should == :blah
       end
       
     end
-
+    
     describe "#messages" do
       
-      it "should welcome_message" do
-        @application.welcome_message.should == "reservoir, version 0.0.4\n"
+      it "should version_message" do
+        @application.version_message.should == "reservoir, version 0.1.0\n"
       end
-
+    
       it "should usage_message" do
         @application.usage_message.should == "USAGE: reservoir <project_file1> <project_file2> ...\n   or  reservoir help to see this message\n"
       end
       
       it "should project_message" do
         p = Project.new(file: "blah.txt")
-        @application.project_message(p).should == "\n===\nLoading Project: local [blah.txt]\n===\n"
+        @application.project_message(p).should == "server: local\nfile: blah.txt\n"
       end
       
       it "should exception_message" do
@@ -148,29 +166,29 @@ module Reservoir
           @application.exception_message($!).split("\n")[0].should == "ERROR: No such file or directory - garble.txt"
         end
       end
-
+    
       it "should which_version_message" do
         @application.which_version_message("a","1.2.3","/path/to/a").should == "a : 1.2.3 : /path/to/a\n"
       end
-
+    
       
     end
     
     describe "#print" do
       
-      it "should return a string if print_mode :string" do
-        @application.print_mode = :string
+      it "should return a string if display :string" do
+        @application.display = :string
         @application.print("x").should == "x"
       end
       
-      it "should write to output if print_mode :stdio" do
+      it "should write to output if display :stdio" do
         STDOUT.should_receive(:puts).with("x")
-        @application.print_mode = :stdio
+        @application.display = :stdio
         @application.print("x")
       end
       
       it "should write to file" do
-        @application.print_mode = { file: "output.txt" }
+        @application.display = { filename: "output.txt" }
         @application.print("x")
         @application.print("y")
         IO.read("output.txt").should == "x\ny\n"

data/spec/project_spec.rb

@@ -19,6 +19,23 @@ module Reservoir
         Project.new(remote_server: "a4word.com", remote_user: "deployer").name.should == "deployer@a4word.com"
       end
       
+    end
+    
+    describe "display" do
+      
+      it "should default to stdio" do
+        Project.new.display.should == :stdio
+      end
+      
+      it "should assume strings are files" do
+        Project.new(display: { :filename => "blah" }).display.should == { filename: "blah" }
+      end
+      
+      it "should assume symbols are as-is" do
+        Project.new(display: :string).display.should == :string
+      end
+      
+      
     end
 
     describe "#load_from_file" do
@@ -30,7 +47,7 @@ module Reservoir
           all.size.should == 1
           project = all.first
           project.scripts.should == [ "ruby", "rvm", "node"]
-          project.output.should == :string
+          project.display.should == :string
         end
 
       end
@@ -47,7 +64,7 @@ module Reservoir
             t = project.template(clazz)
             t.remote_user.should == 'aforward'
             t.remote_server.should == 'a4word.com'
-            project.output.should == "a4word.com.reservoir"
+            project.display.should == { :filename => "a4word.com.reservoir" }
           end
 
           it "should ignore remote data if not set" do

data/spec/sample_project.yml

@@ -1,5 +1,5 @@
-version: 0.0.4
-output: :string
+version: 0.1.0
+display: string
 scripts:
   - name: ruby
   - name: rvm

data/spec/sample_project2.yml

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

data/spec/sample_project3.yml

@@ -0,0 +1,9 @@
+version: 0.1.0
+display: 
+  filename: @@SERVER_NAME@@.reservoir
+  mode: data_only
+remotes:
+  - user: aforward
+    server: a4word.com
+scripts:
+  - name: ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reservoir
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70343763104020 !ruby/object:Gem::Requirement
+  requirement: &70307851600340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343763104020
+  version_requirements: *70307851600340
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70343763103600 !ruby/object:Gem::Requirement
+  requirement: &70307851599920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343763103600
+  version_requirements: *70307851599920
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70343763103140 !ruby/object:Gem::Requirement
+  requirement: &70307851599460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343763103140
+  version_requirements: *70307851599460
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70343763102720 !ruby/object:Gem::Requirement
+  requirement: &70307851599040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343763102720
+  version_requirements: *70307851599040
 description: Helps manage cloud-based server instances by enumerating, comparing and
   diff'ing application configurations
 email:
@@ -84,6 +84,7 @@ files:
 - spec/project_spec.rb
 - spec/sample_project.yml
 - spec/sample_project2.yml
+- spec/sample_project3.yml
 - spec/spec_helper.rb
 - spec/version_spec.rb
 - spec/which_script_spec.rb
@@ -117,6 +118,7 @@ test_files:
 - spec/project_spec.rb
 - spec/sample_project.yml
 - spec/sample_project2.yml
+- spec/sample_project3.yml
 - spec/spec_helper.rb
 - spec/version_spec.rb
 - spec/which_script_spec.rb