reservoir 0.1.1 → 0.1.2

data/.gitignore

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

data/examples/rails_server.yml

@@ -1,4 +1,4 @@
-version: 0.1.1
+version: 0.1.2
 display:
   filename: @@SERVER_NAME@@
   mode: data_only

data/lib/reservoir/application.rb

@@ -38,6 +38,13 @@ module Reservoir
       print "#{script} : #{version} : #{path}\n"
     end
     
+    def interactive_message
+      print "Welcome to reservoir interactive shell"
+    end
+    
+    def interactive_quit_message
+      print "Goodbye"
+    end
     
     def run(args)
       
@@ -45,6 +52,21 @@ module Reservoir
         usage_message
         return
       end
+      
+      if "-i" == args[0]
+        interactive_message
+        v = Version.new
+        loop do
+          script = user_input
+          if script == "quit" || script == "exit"
+            interactive_quit_message
+            return
+          end
+          v.go(script)
+          print v.version
+        end
+        return
+      end
 
       if ["--version","-version","-v","--v","version"].include?(args[0])
         version_message
@@ -98,6 +120,10 @@ module Reservoir
       end
     end
     
+    def user_input
+      STDIN.gets.chomp
+    end
+    
     private
     
       def is_file?

data/lib/reservoir/version.rb

@@ -1,6 +1,6 @@
 module Reservoir
   
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
   
   class Version
     
@@ -22,9 +22,11 @@ module Reservoir
 
     def possible_commands(script_name)
       return [] if script_name.nil? || script_name == ""
-      known_arguments = Version.arguments[script_name]
-      return ["#{script_name} #{known_arguments}"] unless known_arguments.nil?
-      ["--version","-version"].collect { |args| "#{script_name} #{args}"}
+      known_scripts = Version.known_scripts[script_name]
+      return [ known_scripts ] unless known_scripts.nil?
+      all = ["--version","-version"].collect { |args| "#{script_name} #{args}"}
+      all << "npm view #{script_name} | grep version:"
+      all
     end
     
     def go(script_name)

data/lib/reservoir/version_arguments.rb

@@ -2,9 +2,9 @@ module Reservoir
   
   class Version
     
-    def self.arguments
+    def self.known_scripts
       {
-        "ruby" => "--version",
+        "ruby" => "ruby --version",
       }
     end
 

data/spec/application_spec.rb

@@ -17,10 +17,9 @@ module Reservoir
       Caller.stub!(:exec).with("which node").and_return("/path/to/node")
       Caller.stub!(:exec).with("ssh aforward@a4word.com 'which ruby'").and_return("/path/to/a4word/ruby")
 
-      Caller.stub!(:exec).with("ruby --version").and_return("v1.2.3")
-      Caller.stub!(:exec).with("rvm --version").and_return("1.2.4")
-      Caller.stub!(:exec).with("node --version").and_return("")
-      Caller.stub!(:exec).with("node -version").and_return("")      
+      stub_version("ruby","v1.2.3")
+      stub_version("rvm","v1.2.4")
+      stub_version("node")
       Caller.stub!(:exec).with("ssh aforward@a4word.com 'ruby --version'").and_return("1.2.6")
 
       cleanup
@@ -77,6 +76,30 @@ module Reservoir
         
       end
       
+      describe "interactive" do
+        
+        it "should go until quit" do
+          @application.stub!(:user_input).and_return("quit")
+          @application.should_receive(:interactive_message)
+          @application.should_receive(:interactive_quit_message)
+          @application.run(["-i"])
+        end
+        
+        it "should lookup version" do
+          @application.stub!(:user_input).and_return("ruby","rvm","quit")
+          @application.should_receive(:interactive_message)
+          @application.should_receive(:print).with("1.2.3")
+          @application.should_receive(:print).with("4.5.6")
+          v = Version.new
+          Version.stub!(:new).and_return(v)
+          v.stub(:go).and_return(true)
+          v.stub(:version).and_return("1.2.3","4.5.6")
+          @application.should_receive(:interactive_quit_message)
+          @application.run(["-i"])
+        end
+        
+      end
+      
       describe "invalid project file" do
         
         it "should fail gracefully" do
@@ -115,12 +138,12 @@ module Reservoir
         it "should clean up existing files" do
           open("a4word.com", 'a+') { |f| f.puts("garble") }
           @application.run([@project_file,@project_file2])
-          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"
+          IO.read("a4word.com").should == "reservoir, version 0.1.2\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
           @application.run([@project_file3])
-          IO.read("./tmp/moretmp/a4word.com").should == "reservoir, version 0.1.1\nruby : 1.2.6 : /path/to/a4word/ruby\n"
+          IO.read("./tmp/moretmp/a4word.com").should == "reservoir, version 0.1.2\nruby : 1.2.6 : /path/to/a4word/ruby\n"
         end
         
       end
@@ -152,7 +175,7 @@ module Reservoir
     describe "#messages" do
       
       it "should version_message" do
-        @application.version_message.should == "reservoir, version 0.1.1\n"
+        @application.version_message.should == "reservoir, version 0.1.2\n"
       end
     
       it "should usage_message" do

data/spec/spec_helper.rb

@@ -28,3 +28,12 @@ RSpec.configure do |config|
   # config.use_transactional_fixtures = true
 
 end
+
+
+def stub_version(script_name,outputs = [])
+  outputs = [ outputs ] if outputs.kind_of?(String)
+  
+  Reservoir::Caller.stub!(:exec).with("#{script_name} --version").and_return(outputs[0] || "")
+  Reservoir::Caller.stub!(:exec).with("#{script_name} -version").and_return(outputs[1] || "")
+  Reservoir::Caller.stub!(:exec).with("npm view #{script_name} | grep version:").and_return(outputs[2] || "")
+end

data/spec/version_spec.rb

@@ -11,7 +11,7 @@ module Reservoir
     describe "#go" do
       
       it "should use arguments if set" do
-        Version.stub!(:arguments).and_return({ "garble" => "-vgarble" })
+        Version.stub!(:known_scripts).and_return({ "garble" => "garble -vgarble" })
         Caller.stub!(:exec).with("garble -vgarble").and_return("garble v1.2.3")
         @version.go("garble").should == true
         @version.success?.should == true
@@ -20,8 +20,8 @@ module Reservoir
       end
 
       it "should return false if unable to locate version" do
-        Caller.stub!(:exec).with("garble --version").and_return("blah")
-        Caller.stub!(:exec).with("garble -version").and_return("")
+        stub_version("garble",["blah"])
+
         @version.go("garble").should == false
         @version.success?.should == false
         @version.version_info.should == nil
@@ -41,6 +41,8 @@ module Reservoir
         Caller.stub!(:exec).with("garble --version").and_return("v1.2.4")
         Caller.stub!(:exec).with("marble --version").and_return("")
         Caller.stub!(:exec).with("marble -version").and_return("")
+        Caller.stub!(:exec).with("npm view marble | grep version:").and_return("")
+
         
         @version.go("garble").should == true
         @version.version_info.should == "v1.2.4"
@@ -64,12 +66,12 @@ module Reservoir
       end
 
       it "should use arguments if set" do
-        Version.stub!(:arguments).and_return({ "garble" => "-vgarble" })
+        Version.stub!(:known_scripts).and_return({ "garble" => "garble -vgarble" })
         @version.possible_commands("garble").should == ["garble -vgarble"]
       end
       
       it "should provide possible answers if not in known set" do
-        @version.possible_commands("garble").should == ["garble --version","garble -version"]
+        @version.possible_commands("garble").should == ["garble --version","garble -version", "npm view garble | grep version:"]
       end
       
     end
@@ -121,6 +123,12 @@ module Reservoir
           @version.version.should == "3.0.7"
         end
         
+        it "should understand npm package" do
+          @version.read("version: '0.8.4',").should == true
+          @version.version_parts.should == ["0","8","4"]
+          @version.version.should == "0.8.4"
+        end
+        
       end
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reservoir
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156756840 !ruby/object:Gem::Requirement
+  requirement: &70243351891340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156756840
+  version_requirements: *70243351891340
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2156756420 !ruby/object:Gem::Requirement
+  requirement: &70243351890920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156756420
+  version_requirements: *70243351890920
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &2156755960 !ruby/object:Gem::Requirement
+  requirement: &70243351890460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156755960
+  version_requirements: *70243351890460
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2156755540 !ruby/object:Gem::Requirement
+  requirement: &70243351890040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156755540
+  version_requirements: *70243351890040
 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.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: What apps, versions and configurations to you have setup on your server