servant 0.0.1 → 0.0.2

data/README.md

@@ -22,6 +22,7 @@ gem install servant
 mkdir Jobs
 cd Jobs
 servant init
+
 cat > recipes/first_job.rb <<EOF
 name "first_job"
 description "my first job for jenkins"
@@ -34,17 +35,17 @@ servant provision
 
 # Servant Configurations
 
-Servant requires ServantFile on your project directory.
+Servant requires Servantfile on your project directory.
 
 ````ruby
 Servant::Config.run do | config |
   config.ci.url  = "http://localhost:8080"
   
   config.ci.cli  = "/tmp/moe/servant/jenkins-cli.jar"
-  config.ci.cli_options = []
 
   # optional (for update config.xml directly)
   config.ci.user = 'daemon'
+  config.ci.password = '1234'
   config.ci.home = "/home/Shared/Library/Jenkins"
 
   config.ci.jobs :jobs do | jobs |
@@ -112,6 +113,8 @@ scm_type :git do | repositories |
     :branches, "",
   ]
 end
+
+notification.email ["chobieee@gmail.com"]
 ````
 # License
 
@@ -124,3 +127,4 @@ MIT License
 * build_params
 * build step
 * Git
+* notification email

data/bin/servant

@@ -6,6 +6,7 @@ require 'bundler/setup'
 require 'nokogiri'
 require 'log4r'
 
+require 'uri'
 require 'tempfile'
 
 require 'servant/environment'
@@ -13,6 +14,7 @@ require 'servant/config'
 require 'servant/ci'
 require 'servant/jobcollections'
 require 'servant/mixin/trigger'
+require 'servant/mixin/notification'
 require 'servant/mixin/command'
 require 'servant/mixin/command/config'
 require 'servant/mixin/log_rotator'

data/lib/servant/ci.rb

@@ -1,13 +1,13 @@
 module Servant
   class CI
-    attr_accessor :home, :user, :cli, :url, :cli_options
+    attr_accessor :home, :user, :password, :cli, :url
     
     def initialize
       @home = ""
       @user = ""
+      @password = ""
       @cli = ""
       @url = ""
-      @cli_options = []
       @jobs = Servant::JobCollections.new
     end
     

data/lib/servant/environment.rb

@@ -27,20 +27,19 @@ module Servant
       
       case command
       when "init"
-        if FileTest.exists?("ServantFile")
-          print "ServantFile exists."
+        if FileTest.exists?("Servantfile")
+          print "Servantfile exists."
           exit(-1)
         end
         
-        file = open("ServantFile","w")
+        file = open("Servantfile","w")
         file.write <<'EOF'
 Servant::Config.run do | config |
   config.ci.url  = "http://localhost:8080"
   
   config.ci.user = 'daemon'
-  config.ci.cli  = "/tmp/moe/servant/jenkins-cli.jar"
+  config.ci.password = ''
   config.ci.home = "/home/Shared/Library/Jenkins"
-  config.ci.cli_options = []
 
   config.ci.jobs :jobs do | jobs |
     jobs.path = "recipes"
@@ -55,7 +54,7 @@ EOF
         
         Dir::mkdir("./recipes")
       when "list"
-        config = eval IO.read(File.join(Dir.pwd, "ServantFile"))
+        config = eval IO.read(File.join(Dir.pwd, "Servantfile"))
         recipes = config.get_recipe
         print "loaded configurations:\n"
         
@@ -63,7 +62,7 @@ EOF
           print "  #{name}\n"
         end
       when "show"
-        config = eval IO.read(File.join(Dir.pwd, "ServantFile"))
+        config = eval IO.read(File.join(Dir.pwd, "Servantfile"))
 
         print "HOME: " + config.ci.home + "\n"
         print "USER: " + config.ci.user + "\n"
@@ -72,7 +71,7 @@ EOF
 
         exit
       when "provision"
-        config = eval IO.read(File.join(Dir.pwd, "ServantFile"))
+        config = eval IO.read(File.join(Dir.pwd, "Servantfile"))
         recipes = config.get_recipe
         recipes.each do |name, cfg|
           @logger.info "processing `#{name}`..."
@@ -82,11 +81,19 @@ EOF
           tmp.write xmldata
           tmp.close()
           
-          `/usr/bin/java -jar #{config.ci.cli} -s #{config.ci.url} get-job #{name} 2>&1 > /dev/null`
-          if $?.exitstatus == 255
-            `/usr/bin/java -jar #{config.ci.cli} -s #{config.ci.url} create-job #{name} < #{tmp.path}`
+          # set password and user
+          if config.ci.user.size && config.ci.password.size
+            auth = "#{config.ci.user}:#{config.ci.password}"
           else
-            `/usr/bin/java -jar #{config.ci.cli} -s #{config.ci.url} update-job #{name} < #{tmp.path}`
+            auth = ""
+          end
+          
+          encoded_name = URI.encode(cfg.fetch(:name))
+          `curl -s -f #{auth} -X GET #{config.ci.url}/job/#{encoded_name}/config.xml 2>&1 > /dev/null`
+          if $?.exitstatus == 22
+            `curl -s #{auth} -f -X POST #{config.ci.url}/createItem?name=#{encoded_name} --data-binary "@#{tmp.path}" -H "Content-Type: text/xml"`
+          else
+            `curl -s #{auth} -f -X POST #{config.ci.url}/job/#{encoded_name}/config.xml --data-binary "@#{tmp.path}" -H "Content-Type: text/xml"`
           end
           
           if $?.exitstatus == 0
@@ -97,8 +104,8 @@ EOF
           
         end
       when "reload"
-        config = eval IO.read(File.join(Dir.pwd, "ServantFile"))
-        system("/usr/bin/java -jar #{config.ci.cli} -s #{config.ci.url} reload-configuration")
+        config = eval IO.read(File.join(Dir.pwd, "Servantfile"))
+        `curl -s #{auth} -f -X GET #{config.ci.url}/reload 2>&1 > /dev/null`
       else
         show_help
       end

data/lib/servant/mixin/command.rb

@@ -9,9 +9,11 @@ module Servant
       def get_binding
         trigger = Trigger.new
         log_rotator = LogRotator.new
+        notification = Notification.new
                
         @trigger = trigger
         @log_rotator = log_rotator
+        @notification = notification
          
         binding
       end
@@ -28,6 +30,10 @@ module Servant
         if @log_rotator.has_config
           @@config[:log_rotator] = @log_rotator
         end
+        
+        if @notification.has_config
+          @@config[:notification] = @notification
+        end
 
         @@configs[name] = @@config
         @@config = {}

data/lib/servant/mixin/notification.rb

@@ -0,0 +1,16 @@
+module Servant
+  module Mixin
+    class Notification
+      attr_accessor :addresses
+      
+      def has_config
+        @addresses.size
+      end
+      
+      def email(addresses)
+        @addresses = addresses
+      end
+      
+    end
+  end
+end

data/lib/servant/version.rb

@@ -1,3 +1,3 @@
 module Servant
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/servant/writer/xmlwriter.rb

@@ -184,7 +184,17 @@ module Servant
               end
             end
             
-            project.publishers nil
+            project.publishers do | pub |
+              if config.fetch(:notification,nil)
+                mail = config.fetch(:notification)
+                pub.send(:"hudson.tasks.Mailer") do |mailer|
+                  mailer.recipients mail.addresses.join " "
+                  mailer.dontNotifyEveryUnstableBuild false
+                  mailer.sendToIndividuals true
+                end
+              end
+            end
+            
             project.buildWrappers nil
           end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Shuhei Tanuma
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-11 00:00:00 +09:00
+date: 2012-03-12 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - lib/servant/mixin/command.rb
 - lib/servant/mixin/command/config.rb
 - lib/servant/mixin/log_rotator.rb
+- lib/servant/mixin/notification.rb
 - lib/servant/mixin/trigger.rb
 - lib/servant/version.rb
 - lib/servant/writer/xmlwriter.rb