dynport_tools 0.2.21 → 0.2.22

data/Gemfile

@@ -12,7 +12,8 @@ gem "term-ansicolor"
 gem 'diff-lcs'
 
 group :development do
-  gem "rspec", "~> 2.3.0"
+  gem "rake"
+  gem "rspec", "2.8.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -24,14 +24,14 @@ GEM
     rbx-require-relative (0.0.5)
     rcov (0.9.9)
     redis (2.2.1)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.8.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -58,10 +58,11 @@ DEPENDENCIES
   guard
   jeweler (~> 1.6.4)
   nokogiri
+  rake
   rb-fsevent
   rcov
   redis
-  rspec (~> 2.3.0)
+  rspec (= 2.8.0)
   ruby-debug
   spork
   term-ansicolor

data/VERSION

@@ -1 +1 @@
-0.2.21
+0.2.22

data/dynport_tools.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "dynport_tools"
-  s.version = "0.2.21"
+  s.version = "0.2.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = "2012-01-31"
+  s.date = "2012-02-28"
   s.description = "Collection of various tools"
   s.email = "tobias.schwab@dynport.de"
-  s.executables = ["xmldiff", "redis_dumper"]
+  s.executables = ["redis_dumper", "xmldiff"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -42,6 +42,8 @@ Gem::Specification.new do |s|
     "lib/dynport_tools/features.rb",
     "lib/dynport_tools/have_attributes.rb",
     "lib/dynport_tools/jenkins.rb",
+    "lib/dynport_tools/jenkins/project.rb",
+    "lib/dynport_tools/jenkins/remote_project.rb",
     "lib/dynport_tools/job_dsl.rb",
     "lib/dynport_tools/log_tracer.rb",
     "lib/dynport_tools/redis_dumper.rb",
@@ -56,6 +58,8 @@ Gem::Specification.new do |s|
     "spec/dynport_tools/eta_spec.rb",
     "spec/dynport_tools/features_spec.rb",
     "spec/dynport_tools/have_attributes_spec.rb",
+    "spec/dynport_tools/jenkins/project_spec.rb",
+    "spec/dynport_tools/jenkins/remote_project_spec.rb",
     "spec/dynport_tools/jenkins_spec.rb",
     "spec/dynport_tools/job_dsl_spec.rb",
     "spec/dynport_tools/log_tracer_spec.rb",
@@ -74,7 +78,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/tobstarr/dynport_tools"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.17"
   s.summary = "Collection of various tools"
 
   if s.respond_to? :specification_version then
@@ -86,7 +90,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 0"])
       s.add_runtime_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["= 2.8.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -105,7 +110,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<typhoeus>, [">= 0"])
       s.add_dependency(%q<term-ansicolor>, [">= 0"])
       s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["= 2.8.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -125,7 +131,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<typhoeus>, [">= 0"])
     s.add_dependency(%q<term-ansicolor>, [">= 0"])
     s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["= 2.8.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/dynport_tools/embedded_redis.rb

@@ -50,9 +50,13 @@ class DynportTools::EmbeddedRedis
     connection
   end
   
+  def self.system(cmd)
+    Kernel.send(:system, cmd)
+  end
+  
   def do_start!
     FileUtils.mkdir_p(base_path)
-    system(%(echo "#{config}" | redis-server -))
+    self.class.system(%(echo "#{config}" | redis-server -))
     sleep 0.1
     self.started = true
     log "started redis with pid #{pid}"
@@ -88,7 +92,7 @@ class DynportTools::EmbeddedRedis
     log "killing redis"
     if !killed? && pid
       log "killing #{pid}"
-      system(%(kill #{pid})) 
+      self.class.system(%(kill #{pid})) 
       FileUtils.rm_f(socket_path)
       FileUtils.rm_f(dbfile_path)
       self.killed = true

data/lib/dynport_tools/jenkins.rb

@@ -38,10 +38,14 @@ class DynportTools::Jenkins
   end
   
   def post_request(path, options = nil)
-    @cache = {}
+    clear_cache
     Typhoeus::Request.post(*["#{url}/#{path}", options].compact)
   end
   
+  def clear_cache
+    cache.clear
+  end
+  
   def cache
     @cache ||= {}
   end
@@ -74,221 +78,47 @@ class DynportTools::Jenkins
     cache[:projects_details] = jobs
   end
   
+  CONFIGURED_PROJECTS_HASH = :configured_projects_hash
+  
+  def configured_projects_hash=(new_hash)
+    @configured_projects_hash = new_hash
+  end
+  
+  def configured_projects_hash
+    @configured_projects_hash ||= {}
+  end
+  
+  def configured_projects
+    configured_projects_hash.values
+  end
+  
   def remote_projects
     project_details.inject({}) do |hash, (url, project_hash)|
-      hash.merge!(project_hash[:name] => RemoteProject.new(:url => project_hash[:url], :name => project_hash[:name], :xml => project_hash[:body]))
+      hash[project_hash[:name]] = RemoteProject.from_details_hash(project_hash)
+      hash
     end
   end
   
-  class RemoteProject
-    attr_accessor :url, :name, :xml
-    
-    def initialize(options = {})
-      options.each do |key, value|
-        self.send(:"#{key}=", value) if self.respond_to?(:"#{key}=")
-      end
-    end
-    
-    def doc
-      @doc ||= Nokogiri::XML(xml) if xml
-    end
-    
-    def md5
-      Digest::MD5.hexdigest(xml) if xml
-    end
-    
-    def days_to_keep
-      logrotate_value_when_set("daysToKeep")
-    end
-    
-    def num_to_keep
-      logrotate_value_when_set("numToKeep")
-    end
-    
-    def logrotate_value_when_set(key)
-      if node = doc.at("/project/logRotator/#{key}")
-        node.inner_text.to_i if node.inner_text.to_i != -1
-      end
-    end
-    
-    def commands
-      doc.xpath("/project/builders/hudson.tasks.Shell/command").map(&:inner_text)
-    end
-    
-    def crontab_patterns
-      doc.xpath("/project/triggers/hudson.triggers.TimerTrigger/spec").map(&:inner_text)
-    end
-    
-    def disabled?
-      doc.at("/project/disabled/text()").to_s == "true"
-    end
-    
-    def child_projects
-      if projects = doc.xpath("/project/publishers/hudson.tasks.BuildTrigger/childProjects").first
-        projects.inner_text.split(/\s*,\s*/)
-      else
-        []
-      end
-    end
-    
-    def email_addresses
-      doc.xpath("/project/publishers/hudson.tasks.Mailer/recipients").map { |rec| rec.inner_text.split(",") }.flatten
-    end
-    
-    def node
-      doc.xpath("/project/assignedNode").map { |n| n.inner_text }.first
-    end
-    
-    def locks
- doc.xpath("/project/buildWrappers/hudson.plugins.locksandlatches.LockWrapper/locks/hudson.plugins.locksandlatches.LockWrapper_-LockWaitConfig/name").map(&:inner_text)
-    end
+  def exists_remotely?(project)
+    remote_projects.keys.include?(project.name)
   end
   
-  class Project
-    attr_accessor :name, :commands, :crontab_pattern, :days_to_keep, :num_to_keep, :node, :child_projects, :locks, :disabled, :description, 
-      :email_addresses, :git_repository
-    DEFAULT_SCM = "hudson.scm.NullSCM"
-    GIT_SCM = "hudson.plugins.git.GitSCM"
-    
-    def initialize(name = nil)
-      self.name = name
-      self.commands = []
-      self.child_projects = []
-      self.email_addresses = []
-      self.locks = []
-    end
-    
-    def md5
-      Digest::MD5.hexdigest(to_xml)
-    end
-    
-    def log_rotate_xml(node)
-      node.logRotator do
-        node.daysToKeep days_to_keep || -1
-        node.numToKeep num_to_keep || -1 
-        node.artifactDaysToKeep -1
-        node.artifactNumToKeep -1
-      end
-    end
-    
-    def git_repository_xml(xml)
-      xml.send("org.spearce.jgit.transport.RemoteConfig") do
-        xml.string "origin"
-        xml.int 5
-        xml.string "fetch"
-        xml.string "+refs/heads/*:refs/remotes/origin/*"
-        xml.string "receivepack"
-        xml.string "git-upload-pack"
-        xml.string "uploadpack"
-        xml.string "git-upload-pack"
-        xml.string "url"
-        xml.string git_repository
-        xml.string "tagopt"
-        xml.string
-      end
-    end
-    
-    def git_options_xml(xml)
-      xml.mergeOptions
-      xml.recursiveSubmodules false
-      xml.doGenerateSubmoduleConfigurations false
-      xml.authorOrCommitter false
-      xml.clean false
-      xml.wipeOutWorkspace false
-      xml.pruneBranches false
-      xml.buildChooser(:class => "hudson.plugins.git.util.DefaultBuildChooser")
-      xml.gitTool "Default"
-      xml.submoduleCfg(:class => "list")
-      xml.relativeTargetDir
-      xml.excludedRegion
-      xml.excludedUsers
-      xml.skipTag false
-    end
-    
-    def git_xml(xml)
-      xml.scm(:class => GIT_SCM) do
-        xml.config_version 1
-        xml.remoteRepositories do
-          git_repository_xml(xml)
-        end
-        xml.branches do
-          xml.send("hudson.plugins.git.BranchSpec") do
-            xml.name "master"
-          end
-        end
-        git_options_xml(xml)
-      end
-    end
-    
-    def to_xml
-      Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
-        xml.project do
-          xml.actions
-          xml.description *[description].compact
-          log_rotate_xml(xml) if days_to_keep || num_to_keep
-          xml.keepDependencies false
-          xml.properties
-          if git_repository
-            git_xml(xml)
-          else
-            xml.scm(:class => DEFAULT_SCM)
-          end
-          if node
-            xml.assignedNode node 
-            xml.canRoam false
-          else
-            xml.canRoam true
-          end
-          xml.disabled disabled ? true : false
-          xml.blockBuildWhenDownstreamBuilding false
-          xml.blockBuildWhenUpstreamBuilding false
-          xml.triggers(:class => "vector") do
-            if crontab_pattern
-              xml.send("hudson.triggers.TimerTrigger") do
-                xml.spec crontab_pattern
-              end
-            end
-          end
-          xml.concurrentBuild false
-          xml.builders do
-            commands.each do |command|
-              xml.send("hudson.tasks.Shell") do
-                xml.command command
-              end
-            end
-          end
-          xml.publishers do
-            if child_projects.any?
-              xml.send("hudson.tasks.BuildTrigger") do
-                xml.childProjects child_projects.map { |c| c.name }.join(",")
-                xml.threshold do
-                  xml.name "SUCCESS"
-                  xml.ordinal "0"
-                  xml.color "BLUE"
-                end
-              end
-            end
-            if email_addresses.any?
-              xml.send("hudson.tasks.Mailer") do
-                xml.recipients email_addresses.join(",")
-                xml.dontNotifyEveryUnstableBuild true
-                xml.sendToIndividuals false
-              end
-            end
-          end
-          xml.buildWrappers do
-            if locks.any?
-              xml.send("hudson.plugins.locksandlatches.LockWrapper") do
-                xml.locks do
-                  locks.each do |lock|
-                    xml.send("hudson.plugins.locksandlatches.LockWrapper_-LockWaitConfig") { xml.name lock }
-                  end
-                end
-              end
-            end
-          end
-        end
-      end.to_xml
-    end
+  def projects_to_delete
+    configured_projects.select { |project| project.deleted? && exists_remotely?(project) }
+  end
+  
+  def projects_to_create
+    configured_projects.select { |project| !project.deleted? && !exists_remotely?(project) }
+  end
+  
+  def projects_to_update
+    configured_projects.select { | project| exists_remotely?(project) && !project.deleted? && (project.md5 != remote_projects[project.name].md5) }
+  end
+  
+  def not_configured_projects
+    remote_projects.values.select { |project| !configured_projects_hash.keys.include?(project.name) }
   end
-end
+end
+
+require "dynport_tools/jenkins/project"
+require "dynport_tools/jenkins/remote_project"

data/lib/dynport_tools/jenkins/project.rb

@@ -0,0 +1,151 @@
+class DynportTools::Jenkins::Project
+  attr_accessor :name, :commands, :crontab_pattern, :days_to_keep, :num_to_keep, :node, :child_projects, :locks, :disabled
+  attr_accessor :description, :email_addresses, :git_repository, :delete
+  DEFAULT_SCM = "hudson.scm.NullSCM"
+  GIT_SCM = "hudson.plugins.git.GitSCM"
+    
+  def initialize(name = nil)
+    self.name = name
+    self.commands = []
+    self.child_projects = []
+    self.email_addresses = []
+    self.locks = []
+  end
+    
+  def deleted?
+    !!@delete
+  end
+    
+  def md5
+    Digest::MD5.hexdigest(to_xml)
+  end
+    
+  def log_rotate_xml(node)
+    node.logRotator do
+      node.daysToKeep days_to_keep || -1
+      node.numToKeep num_to_keep || -1 
+      node.artifactDaysToKeep -1
+      node.artifactNumToKeep -1
+    end
+  end
+    
+  def git_repository_xml(xml)
+    xml.send("org.spearce.jgit.transport.RemoteConfig") do
+      xml.string "origin"
+      xml.int 5
+      xml.string "fetch"
+      xml.string "+refs/heads/*:refs/remotes/origin/*"
+      xml.string "receivepack"
+      xml.string "git-upload-pack"
+      xml.string "uploadpack"
+      xml.string "git-upload-pack"
+      xml.string "url"
+      xml.string git_repository
+      xml.string "tagopt"
+      xml.string
+    end
+  end
+    
+  def git_options_xml(xml)
+    xml.mergeOptions
+    xml.recursiveSubmodules false
+    xml.doGenerateSubmoduleConfigurations false
+    xml.authorOrCommitter false
+    xml.clean false
+    xml.wipeOutWorkspace false
+    xml.pruneBranches false
+    xml.buildChooser(:class => "hudson.plugins.git.util.DefaultBuildChooser")
+    xml.gitTool "Default"
+    xml.submoduleCfg(:class => "list")
+    xml.relativeTargetDir
+    xml.excludedRegion
+    xml.excludedUsers
+    xml.skipTag false
+  end
+    
+  def git_xml(xml)
+    xml.scm(:class => GIT_SCM) do
+      xml.config_version 1
+      xml.remoteRepositories do
+        git_repository_xml(xml)
+      end
+      xml.branches do
+        xml.send("hudson.plugins.git.BranchSpec") do
+          xml.name "master"
+        end
+      end
+      git_options_xml(xml)
+    end
+  end
+    
+  def to_xml
+    Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
+      xml.project do
+        xml.actions
+        xml.description *[description].compact
+        log_rotate_xml(xml) if days_to_keep || num_to_keep
+        xml.keepDependencies false
+        xml.properties
+        if git_repository
+          git_xml(xml)
+        else
+          xml.scm(:class => DEFAULT_SCM)
+        end
+        if node
+          xml.assignedNode node 
+          xml.canRoam false
+        else
+          xml.canRoam true
+        end
+        xml.disabled disabled ? true : false
+        xml.blockBuildWhenDownstreamBuilding false
+        xml.blockBuildWhenUpstreamBuilding false
+        xml.triggers(:class => "vector") do
+          if crontab_pattern
+            xml.send("hudson.triggers.TimerTrigger") do
+              xml.spec crontab_pattern
+            end
+          end
+        end
+        xml.concurrentBuild false
+        xml.builders do
+          commands.each do |command|
+            xml.send("hudson.tasks.Shell") do
+              xml.command command
+            end
+          end
+        end
+        xml.publishers do
+          if child_projects.any?
+            xml.send("hudson.tasks.BuildTrigger") do
+              xml.childProjects child_projects.map { |c| c.name }.join(",")
+              xml.threshold do
+                xml.name "SUCCESS"
+                xml.ordinal "0"
+                xml.color "BLUE"
+              end
+            end
+          end
+          if email_addresses.any?
+            xml.send("hudson.tasks.Mailer") do
+              xml.recipients email_addresses.join(",")
+              xml.dontNotifyEveryUnstableBuild true
+              xml.sendToIndividuals false
+            end
+          end
+        end
+        xml.buildWrappers do
+          if locks.any?
+            xml.send("hudson.plugins.locksandlatches.LockWrapper") do
+              xml.locks do
+                locks.each do |lock|
+                  xml.send("hudson.plugins.locksandlatches.LockWrapper_-LockWaitConfig") { xml.name lock }
+                end
+              end
+            end
+          end
+        end
+      end
+    end.to_xml
+  end
+end