dynport_tools 0.2.20 → 0.2.21

data/VERSION

@@ -1 +1 @@
-0.2.20
+0.2.21

data/dynport_tools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dynport_tools"
-  s.version = "0.2.20"
+  s.version = "0.2.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
     "spec/dynport_tools_spec.rb",
     "spec/fixtures/file_a.xml",
     "spec/fixtures/jenkins_job.xml",
+    "spec/fixtures/solr_admin.html",
     "spec/spec_helper.rb",
     "spec/xml_diff_spec.rb"
   ]

data/lib/dynport_tools/services.rb

@@ -23,10 +23,20 @@ class DynportTools::Services
     "#{solr_data_root}/solr.xml"
   end
   
+  def solr_core_names
+    get(solr_url).to_s.scan(/a href=\"(.*?)\/admin/).flatten
+  end
+  
   def solr_bootstrapped?
     File.exists?(solr_xml_path)
   end
   
+  def start_solr
+    raise "solr already running" if solr_running?
+    raise "solr must be bootstrapped first" if !solr_bootstrapped?
+    exec "solr #{solr_data_root} > #{solr_data_root}/solr.log 2>&1 &"
+  end
+  
   def bootstrap_solr
     raise "#{solr_xml_path} already exists" if solr_bootstrapped?
     write_solr_xml_when_possible
@@ -49,6 +59,10 @@ class DynportTools::Services
     end
   end
   
+  def get(url)
+    system_call(%(curl -s "#{url}"))
+  end
+  
   def post(url)
     system_call(%(curl -s -I -XPOST "#{url}"))
   end
@@ -75,6 +89,17 @@ class DynportTools::Services
     post("#{solr_url}admin/cores?action=UNLOAD&core=#{core_name}")
   end
   
+  def reload_all_solr_cores
+    solr_core_names.each do |core_name|
+      reload_solr_core(core_name)
+    end
+  end
+  
+  def reload_solr_core(core_name)
+    post("#{solr_url}admin/cores?action=RELOAD&core=#{core_name}")
+  end
+  
+  
   # redis
   attr_writer :redis_path_prefix, :redis_config_path, :redis_config_hash
   

data/spec/dynport_tools/services_spec.rb

@@ -1,11 +1,13 @@
 $:<<File.expand_path("../../../", __FILE__)
 require "dynport_tools"
 require "dynport_tools/services"
+require "spec_helper"
 
 describe "Services" do
   let(:services) { DynportTools::Services.new }
   before(:each) do
     services.stub(:system_call).and_raise("stub me")
+    services.stub!(:exec).and_raise("stub me")
   end
   
   it "can be initialized" do
@@ -31,11 +33,60 @@ describe "Services" do
       FileUtils.rm_rf(tmp_path)
     end
     
-    describe "#solr_bootstrapped?" do
+    before(:each) do
+      services.solr_data_root = tmp_path
+    end
+    
+    describe "#start_solr" do
+      before(:each) do
+        FileUtils.mkdir_p(tmp_path)
+      end
+      
+      it "raises an error when running" do
+        services.stub!(:solr_running?).and_return true
+        lambda {
+          services.start_solr
+        }.should raise_error("solr already running")
+      end
+      
+      it "raises an error when not bootstrapped" do
+        services.stub!(:solr_running?).and_return false
+        services.stub!(:solr_bootstrapped?).and_return false
+        lambda {
+          services.start_solr
+        }.should raise_error("solr must be bootstrapped first")
+      end
+      
+      it "executes the correct system call" do
+        services.stub!(:solr_running?).and_return false
+        services.stub!(:solr_bootstrapped?).and_return true
+        services.unstub(:exec)
+        services.should_receive(:exec).with("solr #{tmp_path} > #{tmp_path}/solr.log 2>&1 &")
+        services.start_solr
+      end
+    end
+    
+    describe "#solr_core_names" do
       before(:each) do
-        services.solr_data_root = tmp_path
+        services.stub!(:get).and_return("")
       end
       
+      it "returns an array" do
+        services.solr_core_names.should be_kind_of(Array)
+      end
+      
+      it "calls the correct url" do
+        services.should_receive(:get).with("http://localhost:8983/solr/").and_return ""
+        services.solr_core_names
+      end
+      
+      it "returns the cirrect core_names" do
+        services.stub!(:get).and_return(File.read(root.join("spec/fixtures/solr_admin.html")))
+        services.solr_core_names.should == %w(test supernova_test some_other)
+      end
+    end
+    
+    describe "#solr_bootstrapped?" do
       it "returns false by default" do
         services.should_not be_solr_bootstrapped
       end
@@ -48,10 +99,6 @@ describe "Services" do
     end
     
     describe "bootstrap_solr" do
-      before(:each) do
-        services.solr_data_root = tmp_path
-      end
-      
       it "raises an error when dir not exists" do
         lambda {
           services.bootstrap_solr
@@ -148,6 +195,26 @@ describe "Services" do
         services.unload_solr_core("core_to_unload")
       end
     end
+    
+    describe "#reload_solr_core" do
+      it "calls the correct post method (haha, post)" do
+        services.solr_url = "http://some.host:8080/solr/"
+        url = "http://some.host:8080/solr/admin/cores?action=RELOAD&core=core_to_unload"
+        services.should_receive(:post).with(url)
+        services.reload_solr_core("core_to_unload")
+      end
+    end
+    
+    describe "#reload_all_solr_cores" do
+      it "calls reload_solr_core with all core_names" do
+        services.stub!(:solr_core_names).and_return(%w(b d f))
+        services.should_receive(:reload_solr_core).with("b")
+        services.should_receive(:reload_solr_core).with("d")
+        services.should_receive(:reload_solr_core).with("f")
+        services.reload_all_solr_cores
+      end
+    end
+    
   end
   
   describe "redis" do
@@ -273,6 +340,7 @@ describe "Services" do
   
   describe "http methods" do
     let(:url) { "http://www.some.host:1234/path" }
+    
     describe "#head" do
       before(:each) do
         services.unstub(:system_call)
@@ -289,6 +357,17 @@ describe "Services" do
       end
     end
     
+    describe "#get" do
+      before(:each) do
+        services.unstub(:system_call)
+      end
+      
+      it "executes the correct system call" do
+        services.should_receive(:system_call).with(%(curl -s "#{url}")).and_return("response body")
+        services.get(url).should == "response body"
+      end
+    end
+    
     describe "#post" do
       before(:each) do
         services.unstub(:system_call)

data/spec/fixtures/solr_admin.html

@@ -0,0 +1,29 @@
+
+
+
+
+
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="solr-admin.css">
+<link rel="icon" href="favicon.ico" type="image/ico"></link>
+<link rel="shortcut icon" href="favicon.ico" type="image/ico"></link>
+<title>Welcome to Solr</title>
+</head>
+
+<body>
+<h1>Welcome to Solr!</h1>
+<a href="."><img border="0" align="right" height="78" width="142" src="admin/solr_small.png" alt="Solr"/></a>
+
+<a href="test/admin/">Admin test</a>
+<br/>
+
+<a href="supernova_test/admin/">Admin supernova_test</a>
+<br/>
+
+<a href="some_other/admin/">Admin some_other</a>
+<br/>
+
+
+</body>
+</html>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 2
-  - 20
-  version: 0.2.20
+  - 21
+  version: 0.2.21
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -337,6 +337,7 @@ files:
 - spec/dynport_tools_spec.rb
 - spec/fixtures/file_a.xml
 - spec/fixtures/jenkins_job.xml
+- spec/fixtures/solr_admin.html
 - spec/spec_helper.rb
 - spec/xml_diff_spec.rb
 homepage: http://github.com/tobstarr/dynport_tools