Ruby Style Guide fixes

.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_from:
+  - rubocop_todo.yml

Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in spacewalk.gemspec
 gemspec

Rakefile

@@ -1,6 +1,6 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-task :default => [:test]
-
-Dir['tasks/**/*.rake'].each { |t| load t }
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+task :default => [:test]
+
+Dir['tasks/**/*.rake'].each { |t| load t }

bin/actions.rb

@@ -5,23 +5,23 @@
 #
 
 # for testing: prefer local path
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require "spacewalk"
-require File.expand_path(File.join(File.dirname(__FILE__),'client'))
+require 'spacewalk'
+require File.expand_path(File.join(File.dirname(__FILE__), 'client'))
 
 #
 # Usage
 #
 
-def usage msg=nil
+def usage(msg=nil)
   STDERR.puts "*** #{msg}" if msg
-  STDERR.puts "Usage:"
-  STDERR.puts "  actions [<options>] <client-fqdn>"
-  STDERR.puts "    --server <spacewalk-server-url>"
-  STDERR.puts "    --future <hours>"
-  STDERR.puts "Checks server for client actions"
-  exit (msg ? 1 : 0)
+  STDERR.puts 'Usage:'
+  STDERR.puts '  actions [<options>] <client-fqdn>'
+  STDERR.puts '    --server <spacewalk-server-url>'
+  STDERR.puts '    --future <hours>'
+  STDERR.puts 'Checks server for client actions'
+  exit(msg ? 1 : 0)
 end
 
 #
@@ -31,47 +31,47 @@ def usage msg=nil
 def parse_args
   require 'getoptlong'
   opts = GetoptLong.new(
-    [ "--help",        "-?",  GetoptLong::NO_ARGUMENT ],
-    [ "--server",      "-s",  GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--future",      "-f",  GetoptLong::REQUIRED_ARGUMENT ]
+    ['--help',        '-?',  GetoptLong::NO_ARGUMENT],
+    ['--server',      '-s',  GetoptLong::REQUIRED_ARGUMENT],
+    ['--future',      '-f',  GetoptLong::REQUIRED_ARGUMENT]
   )
   result = {}
-  opts.each do |opt,arg|
+  opts.each do |opt, arg|
     result[opt[2..-1].to_sym] = arg
   end
   usage if result[:help]
-  usage("No server url given") unless result[:server]
+  usage('No server url given') unless result[:server]
   unless result[:solv]
-    usage("No <client-fqdn> given") if ARGV.empty?
+    usage('No <client-fqdn> given') if ARGV.empty?
     result[:fqdn] = ARGV.shift
-    usage("Multiple <client-fqdn>s given") unless ARGV.empty?
+    usage('Multiple <client-fqdn>s given') unless ARGV.empty?
   end
   result
 end
 
 # convert action to promises
 #  {"id"=>6434, "version"=>2, "action"=>["packages.remove", [[["accountsservice-devel", "0.6.38", "79.1", "", ""]]]]}
 #  {"id"=>6437, "version"=>2, "action"=>["packages.update", [[["aalib-devel", "1.4.0", "503.1.3", "", ""]]]]}
-# 
-def mk_promise action
-  id = action["id"]
-  task, packages = action["action"]
-  promise = "bundle agent "
+#
+def mk_promise(action)
+  id = action['id']
+  task, packages = action['action']
+  promise = 'bundle agent '
   case task
-  when "packages.remove"
-    promise << "mgr_remove"
-    policy = "add"
-  when "packages.update"
-    promise << "mgr_update"
-    policy = "remove"
+  when 'packages.remove'
+    promise << 'mgr_remove'
+    policy = 'add'
+  when 'packages.update'
+    promise << 'mgr_update'
+    policy = 'remove'
   else
-    raise "Task '#{task}' not supported"
+    fail "Task '#{task}' not supported"
   end
   promise << "\n{\n  vars:\n    \"package_list\" slist => {\n      "
   first = true
   packages[0].each do |package|
     name, version, release, epoch, arch = package
-    promise << ", " unless first
+    promise << ', ' unless first
     first = false
     promise << "\"#{name}-#{version}-#{release}\""
   end
@@ -89,7 +89,7 @@ def mk_promise action
   parms = parse_args
 rescue SystemExit
   raise
-rescue Exception => e
+rescue StandardError => e
   usage e.to_s
 end
 
@@ -102,20 +102,20 @@ def mk_promise action
 unless File.exist? fqdn
   STDERR.puts "#{fqdn} must be registered first"
 end
-    
+
 begin
   systemid = File.open(fqdn).read
   server = Spacewalk::Server.new :noconfig => true, :server => parms[:server], :systemid => systemid
   actions = parms[:future] ? server.future_actions(parms[:future].to_i) : server.actions
   if actions
-    actions = [ actions ] unless actions.is_a? Array
+    actions = [actions] unless actions.is_a? Array
     actions.each do |action|
       puts mk_promise action
       unless parms[:future]
-        server.submit_response parms[:action], "0", "Action converted to promise", { }
+        server.submit_response parms[:action], '0', 'Action converted to promise', { }
       end
     end
-  end 
+  end
 rescue
   raise
 end

bin/client.rb

@@ -9,16 +9,16 @@ class Client
   #
   # Dump result as XML to file
   #
-  def dump klass, result
-    File.open("#{klass}.xml", "w+") do |f|
+  def dump(klass, result)
+    File.open("#{klass}.xml", 'w+') do |f|
       f.write result.to_xml
     end
   end
 
   #
   # Constructor
   #
-  def initialize host
+  def initialize(host)
     @host = host
     @data = {}
   end
@@ -37,20 +37,19 @@ def packages
 
     IO.popen("rpm -qa --queryformat \"%{name} %{epoch} %{version} %{release} %{arch} %{installtime}\n\"") do |io|
       io.each do |rpm|
-        name,epoch,version,release,arch,installtime = rpm.split(" ")
-        next if name == "gpg-pubkey"
-        next if arch == "src"
-        package = { "name" => name, "epoch" => epoch, "version" => version, "release" => release, "arch" => arch, "installtime" => installtime.to_i }
+        name, epoch, version, release, arch, installtime = rpm.split(' ')
+        next if name == 'gpg-pubkey'
+        next if arch == 'src'
+        package = { 'name' => name, 'epoch' => epoch, 'version' => version, 'release' => release, 'arch' => arch, 'installtime' => installtime.to_i }
         puts package.inspect
         packages << package
       end
     end
-    
+
     packages
   end
-
-  def profile
 
+  def profile
     # assemble registration information
     # parse /etc/os-release
     #  NAME=openSUSE
@@ -64,26 +63,24 @@ def profile
     #  HOME_URL="https://opensuse.org/"
     #  ID_LIKE="suse"
 
-    data = { "architecture" => RUBY_PLATFORM.split("-")[0] }
-    File.open("/etc/os-release") do |f|
+    data = { 'architecture' => RUBY_PLATFORM.split('-')[0] }
+    File.open('/etc/os-release') do |f|
       f.each do |l|
-        key, val = l.chomp.split("=")
-        val = val[1,-2] if val[0][1] == '"'
+        key, val = l.chomp.split('=')
+        val = val[1, -2] if val[0][1] == '"'
         case key
-        when "VERSION_ID"
-          data["os_release"] = val
-        when "PRETTY_NAME"
-          data["release_name"] = val
+        when 'VERSION_ID'
+          data['os_release'] = val
+        when 'PRETTY_NAME'
+          data['release_name'] = val
         end
       end
     end
     data
   end
-
-
 end # client
 
-if $0 == __FILE__
-  client = Client.new "1.1.1.1"
+if $PROGRAM_NAME == __FILE__
+  client = Client.new '1.1.1.1'
   puts client.packages.inspect
 end