dtk-shell 0.10.0

data/lib/command_helpers/git_repo/merge.rb

@@ -0,0 +1,153 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK; module Client; class CommandHelper
+  class GitRepo
+    class Merge
+
+      def initialize(repo, remote_branch_ref, opts = {})
+        @repo              = repo
+        @remote_branch_ref = remote_branch_ref
+        @local_branch      = repo.local_branch_name
+        
+        # options
+        @opts_commit_sha = opts[:commit_sha]
+        @opts_force = opts[:force]
+        @opts_ignore_dependency_merge_conflict = opts[:ignore_dependency_merge_conflict]
+        @opts_full_module_name = opts[:full_module_name]
+        @opts_command = opts[:command]
+      end
+      
+      def self.merge(repo, remote_branch_ref, opts = {})
+        new(repo, remote_branch_ref, opts).merge
+      end
+
+      def merge
+        if @opts_force
+          merge_force()
+        else
+          # check if merge needed
+          merge_rel = merge_relationship()
+          case merge_rel
+           when :equal 
+            response__no_diffs()
+           when :local_ahead, :branchpoint
+            merge_not_fast_forward(merge_rel)
+           when :local_behind
+            merge_simple()
+           else
+            raise Error.new("Unexpected merge_rel (#{merge_rel})")
+          end
+        end
+      end
+
+      private
+      
+      def merge_force
+        diffs = compute_diffs()
+        # TODO: should put in a commit message that merged from remote repo
+        @repo.merge_theirs(@remote_branch_ref)
+        response(diffs)
+      end
+      
+      def merge_not_fast_forward(merge_rel)
+        if any_conflicts?
+          # @opts_ignore_dependency_merge_conflict means called indirectly
+          if @opts_ignore_dependency_merge_conflict
+            # TODO: hard-wired that dependency is a component module in message: 'component-module/..
+            custom_message = "Unable to do fast-forward merge. You can go to 'component-module/#{@opts_full_module_name}' and pull with --force option but all local changes will be lost." 
+            response(compute_diffs, :custom_message => custom_message)
+          else
+            err_msg = 'Unable to do fast-forward merge. You can use --force'
+            err_msg << " on #{@opts_command}" if @opts_command
+            err_msg <<  ', but all local changes will be lost on target that is being pushed to.'
+            raise ErrorUsage.new(err_msg)
+          end
+        elsif  merge_rel == :local_ahead
+          response__no_diffs(:custom_message => 'No op because local module is ahead')
+        else
+          merge_simple()
+        end
+      end
+
+      def merge_simple
+        # see if any diffs between fetched remote and local branch
+        # this has be done after commit
+        diffs = compute_diffs()
+        return diffs unless diffs.any_diffs?()
+        
+        safe_execute do
+          # TODO: should put in a commit message that merged from remote repo
+          @repo.merge(@remote_branch_ref)
+        end
+        
+        if commit_sha = @opts_commit_sha
+          if commit_sha != @repo.head_commit_sha()
+            raise Error.new("Git synchronization problem: expected local head to have sha (#{commit_sha})")
+          end
+        end
+        
+        response(diffs)
+      end
+      
+      def merge_relationship
+        @repo.merge_relationship(:remote_branch, @remote_branch_ref)    
+      end
+      
+      def any_conflicts?
+        # TODO: optimization is to combine this with mereg to have merge_if_no_conflics? 
+        #       and if no conflicts just commit and merge --no-commit
+        ret = nil
+        begin
+          @repo.command('merge',['--no-commit', @remote_branch_ref])
+         rescue ::Git::GitExecuteError
+          ret = true
+        ensure
+          safe_execute do
+            @repo.command('merge',['--abort'])
+          end
+        end
+        ret
+      end
+
+      def response__no_diffs(opts_response = {})
+        response(diffs__no_diffs(), opts_response)
+      end
+
+      def response(diffs, opts_response = {})
+        { :diffs => diffs, :commit_sha => @repo.head_commit_sha() }.merge(opts_response)
+      end
+      
+      def diffs__no_diffs
+        GitRepo.diffs__no_diffs
+      end
+      
+      def compute_diffs
+        GitRepo.compute_diffs(@repo,  @remote_branch_ref)
+      end
+      
+      def safe_execute(&block)
+        begin
+          yield
+         rescue Exception
+          nil
+        end
+      end
+
+    end
+  end
+end; end; end

data/lib/command_helpers/jenkins_client.rb

@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# TODO: Marked for removal [Haris] - Do we need this?
+require 'jenkins-client'
+module DTK; module Client
+  class JenkinsClient
+    require File.expand_path('jenkins_client/config_xml', File.dirname(__FILE__))
+
+    def self.create_service_module_project(module_id,module_name,repo_url,branch)
+      jenkins_project_name = module_name
+      config_xml_contents = ConfigXML.generate_service_module_project(repo_url,module_id,branch)
+      connection().create_job(jenkins_project_name,config_xml_contents)
+    end
+
+    def self.create_service_module_project?(module_id,module_name,repo_url,branch)
+      jenkins_project_name = module_name
+      jobs = get_jobs()||[]
+      #no op if job exists already
+      unless jobs.find{|j|j["name"] == jenkins_project_name}
+        create_service_module_project(module_id,module_name,repo_url,branch)
+      end
+    end
+
+    def self.create_assembly_project(assembly_name,assembly_id)
+      jenkins_project_name = assembly_name.gsub(/::/,"-")
+      config_xml_contents = ConfigXML.generate_assembly_project(assembly_id)
+      connection().create_job(jenkins_project_name,config_xml_contents)
+    end
+
+    def self.create_assembly_project?(assembly_name,assembly_id)
+      jenkins_project_name = assembly_name.gsub(/::/,"-")
+      jobs = get_jobs()||[]
+      #no op if job exists already
+      unless jobs.find{|j|j["name"] == jenkins_project_name}
+        create_assembly_project(assembly_name,assembly_id)
+      end
+    end
+
+    def self.get_jobs()
+      connection().get_jobs()
+    end
+
+   private
+    def self.connection()
+      return @connection if @connection
+      #TODO: hardwired
+      connection_hash = {
+        :username => "rich",
+        :password => "test",
+        :url => "http://ec2-107-22-254-226.compute-1.amazonaws.com:8080"
+      }
+      @connection = Connection.new(connection_hash)
+    end
+
+    class Connection < Hash
+      def initialize(connection_hash)
+        super()
+        merge!(connection_hash)
+        set_connection()
+      end
+      def create_job(job_name,config_xml_contents)
+        ::Jenkins::Client::Job.create(job_name, config_xml_contents)
+      end
+
+      def get_info()
+        get('api/json')
+      end
+
+      def get_jobs()
+        get_info()["jobs"]
+      end
+     private
+      #TODO: one issue with the jenkins-client adapter is that it a singleton and thus only allows connection under one user to one jenkins server
+      def set_connection()
+        ::Jenkins::Client.configure do |c|
+          c.username = self[:username]
+          c.password = self[:password]
+          c.url = self[:url]
+        end
+      end
+
+      def get(path)
+        faraday_response = ::Jenkins::Client.get(path)
+        unless [200].include?(faraday_response.status)
+          raise Error.new("Bad response from Jenkins (status = #{faraday_response.status.to_s})")
+        end
+        faraday_response.body
+      end
+    end
+  end
+end; end

data/lib/command_helpers/jenkins_client/config_xml.rb

@@ -0,0 +1,288 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#TODO: should haev separet file sfor each template
+require 'erubis'
+class DTK::Client::JenkinsClient
+  module ConfigXML
+    #TODO: this is not working now
+    def self.generate_service_module_project(repo_url,module_id,branch)
+      #TODO: not using branch argument
+      #TODO: did not put in module_id yet
+      template_bindings = {
+        :repo_url => repo_url
+      }
+      ConfigXMLTemplateServiceModule.result(template_bindings)
+    end
+    def self.generate_assembly_project(assembly_id)
+      #TODO: not using branch argument
+      #TODO: did not put in module_id yet
+      template_bindings = {
+        :assembly_id => assembly_id
+      }
+      ConfigXMLTemplateAssembly.result(template_bindings)
+    end
+
+ConfigXMLTemplateServiceModule = Erubis::Eruby.new <<eos
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.gmail.ikeike443.PlayAutoTestJobProperty/>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name></name>
+        <refspec></refspec>
+        <url><%= repo_url %></url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>**</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <disableSubmodules>false</disableSubmodules>
+    <recursiveSubmodules>false</recursiveSubmodules>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <authorOrCommitter>false</authorOrCommitter>
+    <clean>false</clean>
+    <wipeOutWorkspace>false</wipeOutWorkspace>
+    <pruneBranches>false</pruneBranches>
+    <remotePoll>false</remotePoll>
+    <ignoreNotifyCommit>false</ignoreNotifyCommit>
+    <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+    <gitTool>Default</gitTool>
+    <submoduleCfg class="list"/>
+    <relativeTargetDir></relativeTargetDir>
+    <reference></reference>
+    <excludedRegions></excludedRegions>
+    <excludedUsers></excludedUsers>
+    <gitConfigName></gitConfigName>
+    <gitConfigEmail></gitConfigEmail>
+    <skipTag>false</skipTag>
+    <includedRegions></includedRegions>
+    <scmName></scmName>
+ </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>ruby /var/lib/jenkins/r8_e2e.rb</command>
+    </hudson.tasks.Shell>
+  </builders>
+    <publishers>
+    <hudson.plugins.emailext.ExtendedEmailPublisher>
+      <recipientList>$DEFAULT_RECIPIENTS</recipientList>
+      <configuredTriggers>
+        <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+          <email>
+            <recipientList></recipientList>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToDevelopers>true</sendToDevelopers>
+            <sendToRequester>false</sendToRequester>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
+        <hudson.plugins.emailext.plugins.trigger.StillFailingTrigger>
+          <email>
+            <recipientList></recipientList>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToDevelopers>true</sendToDevelopers>
+            <sendToRequester>false</sendToRequester>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>false</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.StillFailingTrigger>
+        <hudson.plugins.emailext.plugins.trigger.FixedTrigger>
+          <email>
+            <recipientList></recipientList>
+            <subject>$PROJECT_DEFAULT_SUBJECT</subject>
+            <body>$PROJECT_DEFAULT_CONTENT</body>
+            <sendToDevelopers>true</sendToDevelopers>
+            <sendToRequester>false</sendToRequester>
+            <includeCulprits>false</includeCulprits>
+            <sendToRecipientList>true</sendToRecipientList>
+          </email>
+        </hudson.plugins.emailext.plugins.trigger.FixedTrigger>
+      </configuredTriggers>
+      <contentType>default</contentType>
+      <defaultSubject>$DEFAULT_SUBJECT</defaultSubject>
+      <defaultContent>${JELLY_SCRIPT,template=&quot;html&quot;}</defaultContent>
+      <attachmentsPattern></attachmentsPattern>
+    </hudson.plugins.emailext.ExtendedEmailPublisher>
+  </publishers>
+  <buildWrappers/>
+</project>
+eos
+
+
+ConfigXMLTemplateAssembly = Erubis::Eruby.new <<eos
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.gmail.ikeike443.PlayAutoTestJobProperty/>
+  </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>#!/usr/bin/env ruby
+
+require &apos;rubygems&apos;
+require &apos;rest_client&apos;
+require &apos;pp&apos;
+require &apos;json&apos;
+
+STDOUT.sync = true
+
+ENDPOINT = &apos;http://ec2-54-247-191-95.eu-west-1.compute.amazonaws.com:7000&apos;
+ASSEMBLY_ID = &apos;<%= assembly_id %>&apos;
+
+# controling &apos;pretty-print&apos; in log file
+JSON_OUTPUT_ENABLED = false
+
+# Method for deleting assembly instances
+def deleteAssembly(assemblyId)
+	responseAssemblyDelete = RestClient.post(ENDPOINT + &apos;/rest/assembly/delete&apos;, &apos;assembly_id&apos; =&gt; assemblyId)
+	puts &quot;Assembly has been deleted! Response: #{responseAssemblyDelete}&quot;
+end
+
+#
+# Method for pretty print of json responses
+def json_print(json)
+	pp json if JSON_OUTPUT_ENABLED
+end
+
+pp &quot;Script has been started!&quot;
+
+puts &quot;Using template ID: #{ASSEMBLY_ID}&quot; 
+
+# Stage the assembly
+stageAssembly = RestClient.post(ENDPOINT + &apos;/rest/assembly/stage&apos;, &apos;assembly_id&apos; =&gt; ASSEMBLY_ID) 
+assemblyId = JSON.parse(stageAssembly)[&quot;data&quot;][&quot;assembly_id&quot;]
+
+puts &quot;Using stage assembly ID: #{assemblyId}&quot; 
+
+# Create a task for the cloned assembly instance
+responseTask = RestClient.post(ENDPOINT + &apos;/rest/assembly/create_task&apos;, &apos;assembly_id&apos; =&gt; assemblyId)
+# Extract task id
+taskId = JSON.parse(responseTask)[&quot;data&quot;][&quot;task_id&quot;]
+# Execute the task
+puts &quot;Starting task id: #{taskId}&quot;
+responseTaskExecute = RestClient.post(ENDPOINT + &apos;/rest/task/execute&apos;, &apos;task_id&apos; =&gt; taskId)
+
+taskStatus = &apos;executing&apos;
+
+while taskStatus.include? &apos;executing&apos;
+	sleep 20
+	responseTaskStatus = RestClient.post(ENDPOINT + &apos;/rest/task/status&apos;, &apos;task_id &apos;=&gt; taskId)
+	taskFullResponse = JSON.parse(responseTaskStatus)
+	taskStatus = taskFullResponse[&quot;data&quot;][&quot;status&quot;]
+	puts &quot;Task status: #{taskStatus}&quot;
+	json_print JSON.parse(responseTaskStatus)
+end
+
+if taskStatus.include? &apos;fail&apos; 
+	# Print error response from the service
+	puts &quot;Smoke test failed, response: &quot;
+	pp taskFullResponse
+	# Delete the cloned assembly&apos;s instance
+	deleteAssembly(assemblyId)
+	abort(&quot;Task with ID #{taskId} failed!&quot;)
+else
+	puts &quot;Task with ID #{taskId} success!&quot;
+end
+
+
+#Create a task for the smoke test
+responseSmokeTest = RestClient.post(ENDPOINT + &apos;/rest/assembly/create_smoketests_task&apos;, &apos;assembly_id&apos; =&gt; assemblyId)
+json_print responseSmokeTest
+
+#Extract task id
+smokeTestId = JSON.parse(responseSmokeTest)[&quot;data&quot;][&quot;task_id&quot;]
+puts &quot;Created smoke test task with ID: #{smokeTestId}&quot;
+#Execute the task
+responseSmokeExecute = RestClient.post(ENDPOINT + &apos;/rest/task/execute&apos;, &apos;task_id&apos; =&gt; smokeTestId)
+
+json_print JSON.parse(responseSmokeExecute)
+
+puts &quot;Starting smoke test task with ID: #{smokeTestId}&quot;
+
+smokeStatus = &apos;executing&apos;
+
+while smokeStatus.include? &apos;executing&apos;
+  sleep 20
+  responseSmokeStatus = RestClient.post(ENDPOINT + &apos;/rest/task/status&apos;, &apos;task_id &apos;=&gt; smokeTestId)
+	fullResponse = JSON.parse(responseSmokeStatus)
+  smokeStatus = fullResponse[&quot;data&quot;][&quot;status&quot;]
+  puts &quot;Smoke test status: #{smokeStatus}&quot;
+end
+
+if smokeStatus.include? &apos;failed&apos;
+	# Delete the cloned assembly&apos;s instance
+	puts &quot;Smoke test failed, response: &quot;
+	pp fullResponse
+
+	# Getting log files for failed jobs
+	task_log_response = RestClient.post(ENDPOINT + &apos;/rest/task/get_logs&apos;, &apos;task_id &apos;=&gt; smokeTestId)
+	puts &quot;Logs response:&quot;	
+	pp JSON.parse(task_log_response)
+
+	deleteAssembly(assemblyId)
+	abort(&quot;Smoke test failed.&quot;) 
+end
+
+# Delete the cloned assembly&apos;s instance, this is the must!
+#deleteAssembly(assemblyId)
+
+#abort(&quot;Testing failure mail report.&quot;)
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.Mailer>
+      <recipients>r8-jenkins@atlantbh.com</recipients>
+      <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+      <sendToIndividuals>false</sendToIndividuals>
+    </hudson.tasks.Mailer>
+  </publishers>
+  <buildWrappers/>
+</project>
+eos
+
+  end
+end