reservoir 0.0.1 → 0.0.2

data/examples/rails_server.yml

@@ -1,7 +1,9 @@
-version: 0.0.1
-remote:
-  user: deployer
-  server: a4word.com
+version: 0.0.2
+remotes:
+  - user: deployer
+    server: a4word.com
+  - user:
+    server:
 scripts:
   - name: ruby
   - name: rvm

data/lib/reservoir/application.rb

@@ -14,8 +14,8 @@ module Reservoir
       "ERROR: #{error.message}\n\n  #{error.backtrace.join('\n  ')}"
     end
     
-    def project_message(filename)
-      "\n===\nLoading Project: #{filename}\n===\n"
+    def project_message(project)
+      "\n===\nLoading Project: #{project.name} [#{project.file}]\n===\n"
     end
     
     def which_script_message(which_script)
@@ -43,19 +43,19 @@ module Reservoir
       
       args.each do |filename|
         begin
-          p = Project.new(file: filename)
+          all_projects = Project.load_from_file(filename)
           Application.print project_message(filename)
-          which_script = p.which_script_template
-          p.scripts.each do |script|
-            which_script.go(script)
-            Application.print which_script_message(which_script)
+          all_projects.each do |p|
+            which_script = p.which_script_template
+            p.scripts.each do |script|
+              which_script.go(script)
+              Application.print which_script_message(which_script)
+            end
           end
         rescue
           Application.print exception_message($!)
         end
       end
-      
-      
       Application.print ""
     end
 

data/lib/reservoir/project.rb

@@ -6,26 +6,37 @@ module Reservoir
     
     def initialize(data = {})
       @file = data[:file]
+      @remote_user = data[:remote_user]
+      @remote_server = data[:remote_server]
+      @scripts = data[:scripts] || []
+    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"] } }
       
-      if @file.nil?
-        @scripts = []
-        return
-      end
-      
-      options = YAML::load( File.open( @file ) )
-      @scripts = options["scripts"].each.collect { |script| script["name"] }
-      
-      unless options["remote"].nil?
-        @remote_user = options["remote"]["user"]
-        @remote_server = options["remote"]["server"]
+      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"]))
+        end
       end
-      
+      all_projects
     end
     
     def which_script_template
       WhichScript.new(remote_user: @remote_user, remote_server: @remote_server)
     end
     
+    def name
+      return "local" if @remote_server.nil?
+      return @remote_server if @remote_user.nil?
+      "#{@remote_user}@#{@remote_server}"
+    end
+    
   end
 
 end

data/lib/reservoir/version.rb

@@ -1,6 +1,6 @@
 module Reservoir
   
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   
   class Version
     

data/spec/application_spec.rb

@@ -65,19 +65,20 @@ module Reservoir
 
         it "should handle one file" do
           @application.should_receive(:welcome_message)
-          @application.should_receive(:project_message).with(@project_file)
+          @application.should_receive(:project_message)
           @application.should_receive(:which_script_message).exactly(3).times
           @application.run([@project_file])
         end
 
         it "should handle multiple file" do
+          @mock = Caller.new
+          @mock.stub!(:go).and_return(true)
+          Caller.stub!(:new).and_return(@mock)
           @application.should_receive(:welcome_message)
-          @application.should_receive(:project_message).with(@project_file)
-          @application.should_receive(:project_message).with(@project_file2)
+          @application.should_receive(:project_message).exactly(2).times
           @application.should_receive(:which_script_message).exactly(4).times
           @application.run([@project_file,@project_file2])
         end
-
         
       end
       
@@ -101,7 +102,7 @@ module Reservoir
     describe "#messages" do
       
       it "should welcome_message" do
-        @application.welcome_message.should == "reservoir, version 0.0.1\n"
+        @application.welcome_message.should == "reservoir, version 0.0.2\n"
       end
 
       it "should usage_message" do
@@ -109,7 +110,8 @@ module Reservoir
       end
       
       it "should project_message" do
-        @application.project_message("blah.txt").should == "\n===\nLoading Project: blah.txt\n===\n"
+        p = Project.new(file: "blah.txt")
+        @application.project_message(p).should == "\n===\nLoading Project: local [blah.txt]\n===\n"
       end
       
       it "should exception_message" do

data/spec/project_spec.rb

@@ -4,36 +4,61 @@ module Reservoir
 
   describe Project do
 
-    before (:each) do
-      @project = Project.new
-    end
-    
-    describe "#scripts" do
+
+    describe "#name" do
+      
+      it "should be local for non remote projects" do
+        Project.new.name.should == "local"
+      end
+
+      it "should be remote_server if no user" do
+        Project.new(remote_server: "a4word.com").name.should == "a4word.com"
+      end
       
-      it "should load from project file" do
-        @project = Project.new(file: File.dirname(__FILE__) + '/sample_project.yml')
-        @project.scripts.should == [ "ruby", "rvm", "node"]
+      it "should be remote_user@remote_server if info available" do
+        Project.new(remote_server: "a4word.com", remote_user: "deployer").name.should == "deployer@a4word.com"
       end
       
     end
 
-    describe "#which_script_template" do
+    describe "#load_from_file" do
       
-      it "should set the remote_user and remote_server" do
-        @project = Project.new(file: File.dirname(__FILE__) + '/sample_project2.yml')
-        which_script = @project.which_script_template
-        which_script.remote_user.should == 'aforward'
-        which_script.remote_server.should == 'a4word.com'
+      describe "#scripts" do
+
+        it "should load from project file" do
+          all = Project.load_from_file(File.dirname(__FILE__) + '/sample_project.yml')
+          all.size.should == 1
+          project = all.first
+          project.scripts.should == [ "ruby", "rvm", "node"]
+        end
+
       end
 
-      it "should ignore remote data if not set" do
-        @project = Project.new(file: File.dirname(__FILE__) + '/sample_project.yml')
-        which_script = @project.which_script_template
-        which_script.remote_user.should == nil
-        which_script.remote_server.should == nil
+      describe "#which_script_template" do
+
+        it "should set the remote_user and remote_server" do
+          all = Project.load_from_file(File.dirname(__FILE__) + '/sample_project2.yml')
+          all.size.should == 1
+          project = all.first
+
+          which_script = project.which_script_template
+          which_script.remote_user.should == 'aforward'
+          which_script.remote_server.should == 'a4word.com'
+        end
+
+        it "should ignore remote data if not set" do
+          all = Project.load_from_file(File.dirname(__FILE__) + '/sample_project.yml')
+          all.size.should == 1
+          project = all.first
+
+          which_script = project.which_script_template
+          which_script.remote_user.should == nil
+          which_script.remote_server.should == nil
+        end
+
+
       end
 
-      
     end
 
   end

data/spec/sample_project.yml

@@ -1,4 +1,4 @@
-version: 0.0.1
+version: 0.0.2
 scripts:
   - name: ruby
   - name: rvm

data/spec/sample_project2.yml

@@ -1,6 +1,6 @@
-version: 0.0.1
-remote:
-  user: aforward
-  server: a4word.com
+version: 0.0.2
+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.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70102825983140 !ruby/object:Gem::Requirement
+  requirement: &70217578438280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102825983140
+  version_requirements: *70217578438280
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70102825982720 !ruby/object:Gem::Requirement
+  requirement: &70217578437860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102825982720
+  version_requirements: *70217578437860
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70102825982260 !ruby/object:Gem::Requirement
+  requirement: &70217578437400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102825982260
+  version_requirements: *70217578437400
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70102825981840 !ruby/object:Gem::Requirement
+  requirement: &70217578436980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102825981840
+  version_requirements: *70217578436980
 description: Helps manage cloud-based server instances by enumerating, comparing and
   diff'ing application configurations
 email: