depengine 3.0.20 → 3.0.21

data/lib/depengine/provider/git.rb

@@ -3,47 +3,47 @@ module Provider
     attr_accessor :repository_url
     attr_accessor :repository_local_dir
 
-    def fetch(options={})
-      Helper.validates_presence_of repository_url, "repository_url not set"
-      Helper.validates_presence_of repository_local_dir, "repository_local_dir not set"
+    def fetch(_options = {})
+      Helper.validates_presence_of repository_url, 'repository_url not set'
+      Helper.validates_presence_of repository_local_dir, 'repository_local_dir not set'
 
       # Make sure directory exists
-      if not File.exists? repository_local_dir
+      unless File.exist? repository_local_dir
         FileUtils.mkdir_p(repository_local_dir)
       end
 
       # Fetch (or clone)
       Dir.chdir(repository_local_dir) do
-        if not File.exists? ".git"
-          $log.writer.info "Clone git repository"
+        if !File.exist? '.git'
+          $log.writer.info 'Clone git repository'
           shell_cmd = "git clone #{repository_url} ."
           output = system shell_cmd
-          if not output
+          unless output
             current_directory = Dir.getwd
             $log.writer.error "Unable to clone repository #{repository_url} into #{current_directory}"
             exit 1
           end
         else
-          $log.writer.info "Fetch git repository"
-          shell_cmd = "git fetch origin"
+          $log.writer.info 'Fetch git repository'
+          shell_cmd = 'git fetch origin'
           output = system shell_cmd
-          if not output
-            $log.writer.error "Unable to fetch from origin"
+          unless output
+            $log.writer.error 'Unable to fetch from origin'
             exit 1
           end
         end
-      end      
+      end
     end
 
-    def checkout(branch_name, options={})
-      Helper.validates_presence_of repository_url, "repository_url not set"
-      Helper.validates_presence_of repository_local_dir, "repository_local_dir not set"
+    def checkout(branch_name, _options = {})
+      Helper.validates_presence_of repository_url, 'repository_url not set'
+      Helper.validates_presence_of repository_local_dir, 'repository_local_dir not set'
 
       Dir.chdir(repository_local_dir) do
         # Pull
-        shell_cmd = "git pull origin master"
+        shell_cmd = 'git pull origin master'
         output = system shell_cmd
-        if not output
+        unless output
           $log.writer.error "Unable to pull branch #{branch_name}"
           exit 1
         end
@@ -51,56 +51,53 @@ module Provider
         # Checkout
         shell_cmd = "git checkout -f #{branch_name}"
         output = system shell_cmd
-        if not output
+        unless output
           $log.writer.error "Unable to checkout branch #{branch_name}"
           exit 1
         end
       end
     end
 
-    def submodule(submodule_option, options={})
-      Helper.validates_presence_of repository_url, "repository_url not set"
-      Helper.validates_presence_of repository_local_dir, "repository_local_dir not set"
+    def submodule(submodule_option, _options = {})
+      Helper.validates_presence_of repository_url, 'repository_url not set'
+      Helper.validates_presence_of repository_local_dir, 'repository_local_dir not set'
 
       Dir.chdir(repository_local_dir) do
         # Submodule init
-        shell_cmd = "git submodule init"
-        output = system shell_cmd
-    
+        shell_cmd = 'git submodule init'
+        system(shell_cmd)
+
         # git submodule update --recursive
         shell_cmd = "git submodule update #{submodule_option}"
         output = system shell_cmd
-        if not output
-          $log.writer.error "Unable to pull submodule"
+        unless output
+          $log.writer.error 'Unable to pull submodule'
           exit 1
         end
       end
     end
 
-
-    def tag(tag_name, options={})
-      Helper.validates_presence_of repository_url, "repository_url not set"
-      Helper.validates_presence_of repository_local_dir, "repository_local_dir not set"
+    def tag(tag_name, options = {})
+      Helper.validates_presence_of repository_url, 'repository_url not set'
+      Helper.validates_presence_of repository_local_dir, 'repository_local_dir not set'
 
       Dir.chdir(repository_local_dir) do
         # Create tag
         shell_cmd = "git tag #{tag_name}"
-        if not options[:hash].nil?
-          shell_cmd << " #{options[:hash]}"
-        end
+        shell_cmd << " #{options[:hash]}" if options[:hash]
 
         output = system shell_cmd
-        if not output
+        unless output
           $log.writer.error "Unable to create tag #{tag_name}"
-          exit 1
+          fail "Unable to create tag #{tag_name}"
         end
 
         # Push tag
-        shell_cmd = "git push -f --tags origin"
+        shell_cmd = 'git push -f --tags origin'
         output = system shell_cmd
-        if not output
-          $log.writer.error "Unable to push to origin"
-          exit 1
+        unless output
+          $log.writer.error 'Unable to push to origin'
+          fail 'Unable to push to origin'
         end
       end
     end
@@ -111,14 +108,12 @@ module Provider
     # * +:r2+ - Include commits that are reachable from r2
     # * +:r1+ - but exclude those that are reachable from r1.
     # Please see `GITREVISIONS(7)` for more info on how to specify a revision range.
-    def history(r1='',r2='HEAD')
+    def history(r1 = '', r2 = 'HEAD')
       rev_range = r1.empty? ? '' : "#{r1}..#{r2}"
 
       Dir.chdir(@repository_local_dir) do
         Processor.local_execute(["git log --oneline #{rev_range}"])
       end
     end
-
   end
 end
-

data/lib/depengine/provider/repository.rb

@@ -1,202 +1,187 @@
 module Provider
-	class Repository
-	
-	  attr_accessor :repository
-	  attr_accessor :worker
-	  attr_accessor :method
-	  attr_accessor :user
-	  attr_accessor :password	  
-	  attr_accessor :host	  
-	  attr_accessor :sshkey	 
-	  attr_accessor :svnbinary
-	  attr_accessor :svncmd
-	  attr_accessor :samba_mountpoints
-
-    def initialize()
-      repository = ""
-      method     = ""
-      user       = ""
-      password   = ""
-      host       = ""
-      sshkey     = ""
-      svnbinary  = ""
-      svncmd     = ""
-      samba_mountpoints = ""
+  class Repository
+    attr_accessor :repository
+    attr_accessor :worker
+    attr_accessor :method
+    attr_accessor :user
+    attr_accessor :password
+    attr_accessor :host
+    attr_accessor :sshkey
+    attr_accessor :svnbinary
+    attr_accessor :svncmd
+    attr_accessor :samba_mountpoints
+
+    def initialize
+      @repository = ''
+      @method     = ''
+      @user       = ''
+      @password   = ''
+      @host       = ''
+      @sshkey     = ''
+      @svnbinary  = ''
+      @svncmd     = ''
+      @samba_mountpoints = ''
     end
 
-	  
-	  def get_from_repository(from, to)
-	  
-   
-      ### get from maven
-	    if method == "maven"
-	      res = nil
-	      response = nil
-	      req = nil
-	      
-        target = to
-   	    string_array = from.split('/')
-   	    file_name = string_array[string_array.length - 1]
-   	    target = target << "/" if target[target.length - 1,1] != "/"
-        target = target + file_name
+    def get_from_maven(from, to)
+      response = nil
+      req = nil
+      target = to
+      string_array = from.split('/')
+      file_name = string_array[string_array.length - 1]
+      target = target << '/' if target[target.length - 1, 1] != '/'
+      target = target + file_name
+
+      #### create target directory
+      unless File.directory?(to)
+        unless FileUtils.mkdir_p(to)
+          $log.writer.error "Unable to create directory #{to}"
+          exit 1
+        end
+      end
+
+      url = URI.parse(repository + from)
+      http = Net::HTTP.new(url.host, url.port)
+      if url.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
 
-        #### create target directory
-        if not File.directory?(to)
-          if not FileUtils.mkdir_p(to)
-            $log.writer.error "Unable to create directory #{to}"
+      begin
+        http.start do |connection|
+          req = Net::HTTP::Get.new(url.path)
+          # req.basic_auth user, password
+          response = connection.request(req)
+          body = response.body
+
+          case response
+          when Net::HTTPSuccess
+            # OK
+            File.open(target, 'w') { |f| f.write body }
+          else
+            $log.writer.error 'Can not get file from ' + url.scheme + '://' + url.host + url.path
             exit 1
           end
         end
-        	      
-	      url = URI.parse(repository + from)
-	      http = Net::HTTP.new(url.host, url.port)
-	      if url.scheme == 'https'
-	        http.use_ssl = true
-	        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-	      end
-        begin
-	        http.start do |http|
-	      	  req = Net::HTTP::Get.new(url.path)
-	      	  #req.basic_auth user, password
-            response = http.request(req)
-            body = response.body
-
-            case response
-              when Net::HTTPSuccess
-                # OK
-                File.open(target, 'w') {|f|
-                  f.write body
-                }
-              else
-                $log.writer.error "Can not get file from " + url.scheme + "://" + url.host + url.path
-                exit 1
-            end
-          end
-        rescue Exception => e
-          $log.writer.error "Can not make a HTTP connection to #{url.host}"
+      rescue
+        $log.writer.error "Can not make a HTTP connection to #{url.host}"
+        exit 1
+      end
+    end
+
+    def get_from_scp(from, to)
+      unless File.file? sshkey
+        $log.writer.error "Keyfile #{File.expand_path sshkey} does not exists"
+        exit 1
+      end
+
+      #### create target directory
+      unless File.directory?(to)
+        unless FileUtils.mkdir_p(to)
+          $log.writer.error "Unable to create directory #{to}"
           exit 1
         end
- 	    end
+      end
 
-      ### get via scp
-	    if method == "scp"
+      begin
+        Net::SCP.start(host, user, keys: [sshkey], host_key: 'ssh-rsa', auth_methods: ['publickey']) do |scp|
+          scp.download!(from, to, recursive: true)
+        end
+      rescue => e
+        $log.writer.error "Can not copy #{host}:#{from} to #{to}"
+        $log.writer.error e.message
+        exit 1
+      end
+    end
 
-	      if not File.file? sshkey
-	        $log.writer.error "Keyfile #{File.expand_path sshkey} does not exists"
-	        exit 1
-	      end
+    def get_from_svn(from, to)
+      ### svn command not set
+      if svncmd.empty?
+        $log.writer.error 'No svn command defined'
+        exit 1
+      end
 
-        #### create target directory
-        if not File.directory?(to)
-          if not FileUtils.mkdir_p(to)
-            $log.writer.error "Unable to create directory #{to}"
-            exit 1
-          end
-        end
-        	      
-        begin
-	        Net::SCP.start(host, user, :keys => [ sshkey ], :host_key => "ssh-rsa", :auth_methods => [ "publickey" ]) do |scp|
-	      	  scp.download!(from, to, :recursive => true)
-	        end
-	      rescue Exception => e
-	        $log.writer.error "Can not copy #{host}:#{from} to #{to}"
-	        $log.writer.error e.message
-	        exit 1
-	      end
-	    end
-
-        ### get from svn
-        if method == "svn"
-
-        ### svn command not set
-        if svncmd.empty?
-          $log.writer.error "No svn command defined"
+      ### get svn info (file or directory
+      shell_cmd = create_svn_cmd('info', from, '')
+      output = `#{shell_cmd}`
+      doc = REXML::Document.new output
+      root = doc.root
+      target = to
+      if root.elements['/info/entry'].attributes['kind'] == 'fil     e'
+        string_array = from.split('/     ')
+        file_name = string_array[string_array.length -      1]
+        target = target << '/' if target[target.length - 1, 1] != '     /'
+        target = target + file_name
+      end
+
+      #### create target directory
+      unless File.directory?(to)
+        unless FileUtils.mkdir_p(to)
+          $log.writer.error "Unable to create directory #{to}"
           exit 1
         end
-  	    
-  	### get svn info (file or directory
-  	shell_cmd = create_svn_cmd('info',from,"")
-  	output = %x[#{shell_cmd}]
-        doc = REXML::Document.new output
-        root = doc.root
-        target = to
-  	if root.elements["/info/entry"].attributes["kind"] == "file"
-    	  string_array = from.split('/')
-    	  file_name = string_array[string_array.length - 1]
-    	  target = target << "/" if target[target.length - 1,1] != "/"
-          target = target + file_name
-  	end  
-  	    
-        #### create target directory
-        if not File.directory?(to)
-          if not FileUtils.mkdir_p(to)
-            $log.writer.error "Unable to create directory #{to}"
-            exit 1
-          end
+      end
+
+      shell_cmd = create_svn_cmd(svncmd, from, target)
+      $log.writer.debug "Execute command: #{shell_cmd}"
+      output = system shell_cmd
+      return if output
+      $log.writer.error "svn #{svncmd} failed"
+      fail "svn #{svncmd} failed"
+    end
+
+    def get_from_samba(from, to)
+      #### create target directory
+      unless File.directory?(to)
+        unless FileUtils.mkdir_p(to)
+          $log.writer.error "Unable to create target directory #{to}"
+          fail "Unable to create target directory #{to}"
         end
-        
-  	shell_cmd = create_svn_cmd(svncmd,from,target)
+      end
+      begin
+        worker.samba_mount(repository, "#{samba_mountpoints}/#{repository}")
+
+        # local rsync
+        shell_cmd = "rsync -va --delete #{samba_mountpoints}/#{repository}/#{from}/ #{to}"
         $log.writer.debug "Execute command: #{shell_cmd}"
         output = system shell_cmd
-        if not output
-          $log.writer.error "svn #{svncmd} failed"
-          exit 1
+        unless output
+          $log.writer.error "#{method} #{shell_cmd} failed"
+          fail "#{method} #{shell_cmd} failed"
         end
+        $log.writer.info output
 
-	    end
-        if method == "samba"
-          #### create target directory
-          if not File.directory?(to)
-            if not FileUtils.mkdir_p(to)
-              $log.writer.error "Unable to create target directory #{to}"
-              exit 1
-            end
-          end
-          begin
-            worker.samba_mount(repository,"#{samba_mountpoints}/#{repository}")
-
-            # local rsync
-            shell_cmd = "rsync -va --delete #{samba_mountpoints}/#{repository}/#{from}/ #{to}"
-            $log.writer.debug "Execute command: #{shell_cmd}"
-            output = system shell_cmd
-            if not output
-              $log.writer.error "#{method} #{shell_cmd} failed"
-              exit 1
-            end
-            $log.writer.info output
-
-            # umount
-            worker.samba_umount("#{samba_mountpoints}/#{repository}")
-
-          rescue Exception => e
-            $log.writer.error "Can not provide files using #{method}"
-            $log.writer.error e.message
-            $log.writer.error e.backtrace.join("\n")
-            worker.samba_umount("#{samba_mountpoints}/#{repository}")
-            exit 1
-          end
-	    end
-	  end
+        # umount
+        worker.samba_umount("#{samba_mountpoints}/#{repository}")
 
-### create svn command
-    def create_svn_cmd(svncmd,from,target)
-      shell_cmd = svnbinary + " " + svncmd
-      shell_cmd = shell_cmd + " --force" if svncmd == "checkout" or svncmd == "export"
-      shell_cmd = shell_cmd + " --xml" if svncmd == "info"
-      
+      rescue => e
+        $log.writer.error "Can not provide files using #{method}"
+        $log.writer.error e.message
+        $log.writer.error e.backtrace.join("\n")
+        worker.samba_umount("#{samba_mountpoints}/#{repository}")
+        exit 1
+      end
+    end
 
-      if not user.empty? and not password.empty?
-	      shell_cmd = shell_cmd + " --username " + user + \
-                                      " --password " + password
-	    end
+    def get_from_repository(from, to)
+      get_from_maven(from, to) if method == 'maven'
+      get_from_scp(from, to) if method == 'scp'
+      get_from_svn(from, to) if method == 'svn'
+      get_from_samba(from, to) if method == 'samba'
+    end
+
+    def create_svn_cmd(svncmd, from, target)
+      shell_cmd = svnbinary + ' ' + svncmd
+      shell_cmd = shell_cmd + ' --force' if svncmd == 'checkout' or svncmd == 'export'
+      shell_cmd = shell_cmd + ' --xml' if svncmd == 'info'
 
-      shell_cmd = shell_cmd + " " + repository + "/" + from
-      if svncmd =~ /^checkout/ or svncmd =~ /^export/
-        shell_cmd = shell_cmd + " " + target.to_s
+      if not user.empty? and not password.empty?
+        shell_cmd = shell_cmd + ' --username ' + user + \
+                                      ' --password ' + password
       end
-      return shell_cmd
-    end 
 
+      shell_cmd = shell_cmd + ' ' + repository + '/' + from
+      shell_cmd = shell_cmd + ' ' + target.to_s if svncmd =~ /^checkout/ or svncmd =~ /^export/ # rubocop:disable Lint/UselessAssignment
+    end
   end
 end
-