dynport_tools 0.2.2 → 0.2.3

data/Gemfile

@@ -7,6 +7,7 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 gem 'nokogiri'
 gem 'redis'
+gem 'typhoeus'
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/Gemfile.lock

@@ -14,6 +14,7 @@ GEM
       rake
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
+    mime-types (1.16)
     nokogiri (1.5.0)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
@@ -32,6 +33,9 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    typhoeus (0.2.4)
+      mime-types
+      mime-types
 
 PLATFORMS
   ruby
@@ -47,3 +51,4 @@ DEPENDENCIES
   redis
   rspec (~> 2.3.0)
   ruby-debug
+  typhoeus

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/dynport_tools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
@@ -32,15 +32,20 @@ Gem::Specification.new do |s|
     "bin/xmldiff",
     "dynport_tools.gemspec",
     "lib/dynport_tools.rb",
+    "lib/dynport_tools/deep_merger.rb",
     "lib/dynport_tools/differ.rb",
+    "lib/dynport_tools/jenkins.rb",
     "lib/dynport_tools/redis_dumper.rb",
     "lib/dynport_tools/xml_file.rb",
     "lib/have_attributes.rb",
+    "spec/dynport_tools/deep_merger_spec.rb",
     "spec/dynport_tools/differ_spec.rb",
+    "spec/dynport_tools/jenkins_spec.rb",
     "spec/dynport_tools/redis_dumper_spec.rb",
     "spec/dynport_tools/xml_file_spec.rb",
     "spec/dynport_tools_spec.rb",
     "spec/fixtures/file_a.xml",
+    "spec/fixtures/jenkins_job.xml",
     "spec/spec_helper.rb",
     "spec/xml_diff_spec.rb"
   ]
@@ -56,6 +61,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<redis>, [">= 0"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -67,6 +73,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<typhoeus>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -79,6 +86,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<typhoeus>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/dynport_tools/deep_merger.rb

@@ -0,0 +1,39 @@
+class DynportTools::DeepMerger
+  class << self
+    def merge(a, b)
+      if a.class == b.class
+        if a.is_a?(Hash)
+          return merge_hashes(a, b)
+        elsif a.is_a?(Array)
+          return merge_arrays(a, b)
+        end
+      end
+      b
+    end
+    
+    def merge_arrays(a, b)
+      [a.length, b.length].max.times.map do |i|
+        if b.length < i + 1
+          a[i]
+        elsif a.length < i + 1
+          b[i]
+        else
+          merge(a[i], b[i])
+        end
+      end
+    end
+    
+    def merge_hashes(a, b)
+      (a.keys + b.keys).uniq.inject({}) do |hash, key|
+        if !a.has_key?(key)
+          hash[key] = b[key]
+        elsif !b.has_key?(key)
+          hash[key] = a[key]
+        else
+          hash[key] = merge(a[key], b[key])
+        end
+        hash
+      end
+    end
+  end
+end

data/lib/dynport_tools/jenkins.rb

@@ -0,0 +1,37 @@
+require "typhoeus"
+require "nokogiri"
+
+class DynportTools::Jenkins
+  attr_accessor :url
+  
+  def initialize(url = nil)
+    self.url = url
+  end
+  
+  def hydra
+    @hydra ||= Typhoeus::Hydra.new
+  end
+  
+  def jobs_hash
+    Nokogiri::XML(Typhoeus::Request.get("#{url}/api/xml").body).search("job").inject({}) do |hash, node|
+      url = node.at("url").inner_text.strip if node.at("url")
+      name = node.at("name").inner_text.strip if node.at("name")
+      hash[url] = { :url => url, :name => name }
+      hash
+    end
+  end
+  
+  def job_details
+    jobs = {}
+    jobs_hash.each do |url, job|
+      request = Typhoeus::Request.new("#{url}config.xml")
+      request.on_complete do |response|
+        xml = Nokogiri::XML(response.body).to_s
+        jobs[url] = job.merge(:body => xml, :md5 => Digest::MD5.hexdigest(xml))
+      end
+      hydra.queue(request)
+    end
+    hydra.run
+    jobs
+  end
+end

data/lib/dynport_tools.rb

@@ -1,7 +1,4 @@
 module DynportTools
-  class << self
-    def xmldiff(file1, file2)
-      throw :print_usage
-    end
-  end
-end
+end
+
+%w(deep_merger differ jenkins redis_dumper xml_file).map { |m| require "dynport_tools/#{m}" }

data/spec/dynport_tools/deep_merger_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe DynportTools::DeepMerger do
+  it "merges two hashes" do
+    DynportTools::DeepMerger.merge({ :a => 1 }, { :b => 2 }).should == { :a => 1, :b => 2 }
+  end
+  
+  it "merges two arrays with same number of attributes" do
+    DynportTools::DeepMerger.merge([{ :a => 1, :b => 1 }], [{ :a => 2, :c => 3 }]).should == [{ :a => 2, :b => 1, :c => 3 }]
+  end
+  
+  it "correctly merges two arrays with the first one being longer" do
+    DynportTools::DeepMerger.merge([{ :a => 1, :b => 1 }], []).should == [{ :a => 1, :b => 1 }]
+  end
+  
+  it "correctly merges two arrays with the first one being longer" do
+    DynportTools::DeepMerger.merge([], [{ :a => 1, :b => 1 }]).should == [{ :a => 1, :b => 1 }]
+  end
+  
+  it "merges simple arrays" do
+    DynportTools::DeepMerger.merge([1, 2, 3], [3, 4]).should == [3, 4, 3]
+  end
+  
+  it "correctly merges two arrays with different numbers and content" do
+    DynportTools::DeepMerger.merge([{ :a => 1 }, { :b => 2, :c => 3 }], [{ :b => 2 }, { :c => 2 }, { :d => 1 }]).should == [
+      { :a => 1, :b => 2 },
+      { :b => 2, :c => 2 },
+      { :d => 1 }
+    ]
+  end
+  
+  it "returns the second argument when types are different" do
+    DynportTools::DeepMerger.merge([], "a").should == "a"
+  end
+  
+  it "calls merge on each value of two hashes" do
+    a = { :a => 1, :b => 2 }
+    b = { :b => 1, :c => 2 }
+    DynportTools::DeepMerger.merge(a, b).should == { :a => 1, :b => 1, :c => 2 }
+  end
+  
+  it "returns b when both have the same type but not array or hash" do
+    DynportTools::DeepMerger.merge(1, 2).should == 2
+  end
+  
+  describe "#merge_hashes" do
+    it "joins both hashes" do
+      DynportTools::DeepMerger.merge_hashes({:a => 1}, {:b => 2}).should == { :a => 1, :b => 2 }
+    end
+    
+    it "overwrites values from a with values from b" do
+      DynportTools::DeepMerger.merge_hashes({:a => 1}, {:a => 2}).should == { :a => 2 }
+    end
+    
+    it "merges nested hashes" do
+      DynportTools::DeepMerger.merge_hashes({ :nested => { :a1 => 1, :b1 => 1 } }, { :nested => { :a1 => 2, :b2 => 3 }}).should == { 
+        :nested => { :a1 => 2, :b1 => 1, :b2 => 3 }
+      }
+    end
+  end
+end

data/spec/dynport_tools/jenkins_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+require "dynport_tools/jenkins"
+
+describe "DynportTools::Jenkins" do
+  let(:root) { "http://some.url.com:8098" }
+  let(:jenkins) { DynportTools::Jenkins.new(root) }
+  
+  describe "#initialize" do
+    it "sets the root url" do
+      DynportTools::Jenkins.new("some/host").url.should == "some/host"
+    end
+  end
+  
+  describe "#jobs_hash" do
+    let(:body) do
+      html =<<-HTML
+        <hudson>
+        <assignedLabel/>
+        <mode>NORMAL</mode>
+        <nodeDescription>the master Hudson node</nodeDescription>
+        <nodeName/>
+        <numExecutors>5</numExecutors>
+        <job>
+        <name>Job 2</name>
+        <url>
+        http://hudson.host:8080/job/Job2/
+        </url>
+        <color>blue</color>
+        </job>
+        <job>
+        <name>Job 1</name>
+        <url>
+        http://hudson.host:8080/job/Job1/
+        </url>
+        <color>blue</color>
+        </job>
+        </hudson>
+      HTML
+    end
+    
+    let(:response) { double("response", :body => body).as_null_object }
+    
+    before(:each) do
+      Typhoeus::Request.stub(:get).and_return response
+    end
+    
+    it "fetches the correct url" do
+      Typhoeus::Request.should_receive(:get).with("http://some.url.com:8098/api/xml")
+      jenkins.jobs_hash
+    end
+    
+    it "returns the correct jobs_hash" do
+      jobs = jenkins.jobs_hash
+      jobs["http://hudson.host:8080/job/Job1/"].should == { :url => "http://hudson.host:8080/job/Job1/", :name => "Job 1"}
+      jobs["http://hudson.host:8080/job/Job2/"].should == { :url => "http://hudson.host:8080/job/Job2/", :name => "Job 2"}
+    end
+  end
+
+  describe "#job_details" do
+    before(:each) do
+      jenkins.stub!(:jobs_hash).and_return(
+        "http://hudson.host:8080/job/Job1/" => { :url => "http://hudson.host:8080/job/Job1/", :name => "Job 1"},
+        "http://hudson.host:8080/job/Job2/" => { :url => "http://hudson.host:8080/job/Job2/", :name => "Job 2"}
+      )
+    end
+    
+    it "returns a hash with the correct job details and normalizes with nokogiri" do
+      response1 = Typhoeus::Response.new(:code => 200, :headers => "", :body => "<root><a>test1</a><b></b></root>")
+      response2 = Typhoeus::Response.new(:code => 200, :headers => "", :body => "<root><a>test2</a><b></b></root>")
+      jenkins.hydra.stub(:get, "http://hudson.host:8080/job/Job1/config.xml").and_return(response1)
+      jenkins.hydra.stub(:get, "http://hudson.host:8080/job/Job2/config.xml").and_return(response2)
+      details = jenkins.job_details
+      details.should be_an_instance_of(Hash)
+      details["http://hudson.host:8080/job/Job2/"].should == {
+        :body=>"<?xml version=\"1.0\"?>\n<root>\n  <a>test2</a>\n  <b/>\n</root>\n", 
+        :md5=>"b52105fcdd28fe6428df019e121f106a", :name=>"Job 2", :url=>"http://hudson.host:8080/job/Job2/"
+      }
+      details["http://hudson.host:8080/job/Job1/"].should == {
+        :body=>"<?xml version=\"1.0\"?>\n<root>\n  <a>test1</a>\n  <b/>\n</root>\n", 
+        :md5=>"14fa3890bea86820f7e45ce7f5a3ada4", :name=>"Job 1", :url=>"http://hudson.host:8080/job/Job1/"
+      }
+    end
+    
+    it "has a builder" do
+      builder = Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
+        xml.project {
+          xml.actions
+          xml.description
+          xml.keepDependencies false
+          xml.properties
+          xml.scm(:class => "hudson.scm.NullSCM")
+          xml.canRoam true
+          xml.disabled false
+          xml.blockBuildWhenDownstreamBuilding false
+          xml.blockBuildWhenUpstreamBuilding false
+          xml.triggers(:class => "vector")
+          xml.concurrentBuild false
+          xml.builders do
+            xml.send("hudson.tasks.Shell") do
+              xml.command %(#!/bin/sh\nssh some.host "cd /some/path && ./script/runner -e production 'Some.command'")
+            end
+          end
+          xml.publishers
+          xml.buildWrappers do
+            xml.send("hudson.plugins.locksandlatches.LockWrapper") do
+              xml.locks do
+                xml.send("hudson.plugins.locksandlatches.LockWrapper_-LockWaitConfig") do
+                  xml.name "Popularities"
+                end
+              end
+            end
+          end
+        }
+      end
+      builder.to_xml.should == Nokogiri::XML(File.read(ROOT.join("spec/fixtures/jenkins_job.xml"))).to_s
+    end
+  end
+end

data/spec/dynport_tools_spec.rb

@@ -1,12 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "DynportTools" do
-  describe "#xmldiff" do
-    it "raises print usage when first file does not exist" do
-      catch(:print_usage) do
-        DynportTools.xmldiff(nil, nil)
-        violated "print_usage should been thrown"
-      end
-    end
-  end
 end

data/spec/fixtures/jenkins_job.xml

@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/sh
+ssh some.host &quot;cd /some/path &amp;&amp; ./script/runner -e production &apos;Some.command&apos;&quot;</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers>
+    <hudson.plugins.locksandlatches.LockWrapper>
+      <locks>
+        <hudson.plugins.locksandlatches.LockWrapper_-LockWaitConfig>
+          <name>Popularities</name>
+        </hudson.plugins.locksandlatches.LockWrapper_-LockWaitConfig>
+      </locks>
+    </hudson.plugins.locksandlatches.LockWrapper>
+  </buildWrappers>
+</project>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -19,8 +19,9 @@ date: 2011-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: nokogiri
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +44,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: redis
-  version_requirements: *id002
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: typhoeus
   prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +74,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: rspec
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +90,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,12 +106,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,12 +120,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -121,12 +136,12 @@ dependencies:
         - 5
         - 0
         version: 4.5.0
-  name: ZenTest
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +150,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest
-  version_requirements: *id008
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  name: autotest-growl
+  prerelease: false
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,12 +164,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest-growl
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,9 +178,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
-  version_requirements: *id010
-  prerelease: false
+  type: :development
+  requirement: *id011
 description: Collection of various tools
 email: tobias.schwab@dynport.de
 executables: 
@@ -191,15 +205,20 @@ files:
 - bin/xmldiff
 - dynport_tools.gemspec
 - lib/dynport_tools.rb
+- lib/dynport_tools/deep_merger.rb
 - lib/dynport_tools/differ.rb
+- lib/dynport_tools/jenkins.rb
 - lib/dynport_tools/redis_dumper.rb
 - lib/dynport_tools/xml_file.rb
 - lib/have_attributes.rb
+- spec/dynport_tools/deep_merger_spec.rb
 - spec/dynport_tools/differ_spec.rb
+- spec/dynport_tools/jenkins_spec.rb
 - spec/dynport_tools/redis_dumper_spec.rb
 - spec/dynport_tools/xml_file_spec.rb
 - spec/dynport_tools_spec.rb
 - spec/fixtures/file_a.xml
+- spec/fixtures/jenkins_job.xml
 - spec/spec_helper.rb
 - spec/xml_diff_spec.rb
 has_rdoc: true