idb 2.9.0 → 2.9.1

data/lib/lib/screen_shot_util.rb

@@ -2,8 +2,7 @@ require_relative 'ssh_operations'
 
 module Idb
   class ScreenShotUtil
-
-    def initialize data_path, ops, sim = true
+    def initialize(data_path, ops, sim = true)
       @data_path = data_path
       ap @data_path
       @snapshot_path = "#{@data_path}/Library/Caches/Snapshots"
@@ -13,41 +12,35 @@ module Idb
 
     def mark
       if @sim
-        #create snapshot dir!
-        if not Dir.exist? @snapshot_path
-          Dir.mkdir_p @snapshot_path
-        end
+        # create snapshot dir!
+        Dir.mkdir_p @snapshot_path unless Dir.exist? @snapshot_path
       end
       mark_time
     end
 
-
     def check
       # there should really be only one directory in here which is named
       # based on the bundle id of the app. lets go through all, just in case.
 
-      snap_dirs = @ops.list_dir("#{@snapshot_path}/").reject {|e| e =~ /^\.\.?$/}
-
+      snap_dirs = @ops.list_dir("#{@snapshot_path}/").reject { |e| e =~ /^\.\.?$/ }
 
-      snap_dirs.each { |dir|
+      snap_dirs.each do |dir|
         full_snap_dir = "#{@snapshot_path}/#{dir}"
-        if @ops.directory? full_snap_dir
-
-          # walk through all files in snaphot dir
-          content = @ops.dir_glob(full_snap_dir,"**/*")
-
-          # see if any is younger than mark.
-          content.each { |f|
-  #          full_path = "#{full_snap_dir}/#{f}"
-            full_path = f
-            if @ops.file? full_path and @ops.mtime(full_path) > @time
-              return full_path
-            end
-          }
+        next unless @ops.directory? full_snap_dir
+
+        # walk through all files in snaphot dir
+        content = @ops.dir_glob(full_snap_dir, "**/*")
+
+        # see if any is younger than mark.
+        content.each do |f|
+          #          full_path = "#{full_snap_dir}/#{f}"
+          full_path = f
+          if @ops.file?(full_path) && @ops.mtime(full_path) > @time
+            return full_path
+          end
         end
-      }
-      return nil
-
+      end
+      nil
     end
 
     private
@@ -55,6 +48,5 @@ module Idb
     def mark_time
       @time = Time.now
     end
-
   end
-end
+end

data/lib/lib/settings.rb

@@ -1,23 +1,19 @@
 # encoding: utf-8
 require 'yaml'
 
-#YAML::ENGINE.yamler='psych'
+# YAML::ENGINE.yamler='psych'
 
 module Idb
   class Settings
-
-    def initialize file_name
+    def initialize(file_name)
       @file_name = file_name
       if file_name.nil?
-        @data = Hash.new
+        @data = {}
       else
-        if not self.load
-          @data = Hash.new
-        end
+        @data = {} unless load
       end
     end
 
-
     def load
       if File.exist? @file_name
         $log.info "Loading configuration from #{@file_name}"
@@ -26,7 +22,7 @@ module Idb
         true
       else
         $log.warn "No configuration found, generating default."
-        @data = Hash.new
+        @data = {}
         @data["ssh_host"] = "localhost"
         @data["ssh_port"] = 22
         @data["ssh_username"] = "root"
@@ -42,26 +38,27 @@ module Idb
 
     def store
       $log.info "Storing new configuration at #{@file_name}."
-      conf_file = File.open(@file_name,"w")
+      conf_file = File.open(@file_name, "w")
       conf_file.puts(@data.to_yaml)
       conf_file.close
     end
 
     private
+
     def method_missing(method, *args, &block)
       m = method.to_s
-      if @data.has_key?(m)
-        return @data[m]
-      elsif @data.has_key?(m.to_sym)
-        return @data[m.to_sym]
-      end
+
+      return @data[m] if @data.key?(m)
+      return @data[m.to_sym] if @data.key?(m.to_sym)
       begin
         @data.send(method, *args, &block)
       rescue
-        nil
+        super
       end
     end
 
-
+    def respond_to_missing?(method_name, include_private = false)
+      @data.key?(method_name) || @data.key?(method_name.to_sym) || super
+    end
   end
 end

data/lib/lib/simulator.rb

@@ -6,40 +6,38 @@ module Idb
   class Simulator < AbstractDevice
     attr_accessor :sim_dir
 
-    def initialize sim_dir
+    def initialize(sim_dir)
       puts "Initializing simulator with #{sim_dir}"
       @sim_dir = sim_dir
       @apps_dir = @sim_dir + "/Applications"
       @ops = LocalOperations.new
-
     end
 
     def open_installed?
       true
     end
 
-    def app_launch app
-      cmd = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app/Contents/MacOS/iPhone\ Simulator -SimulateApplication '
+    def app_launch(app)
+      cmd = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/' \
+            'Developer/Applications/iPhone\ Simulator.app/Contents/MacOS/' \
+            'iPhone\ Simulator -SimulateApplication '
       $log.info "Launching app..."
       @ops.launch_app cmd, app.binary_path
     end
 
-
-    def self.get_simulators
+    def self.simulators
       basedir = ENV['HOME'] + '/Library/Application Support/iPhone Simulator'
 
-      return Array.new unless Dir.exists? basedir
+      return [] unless Dir.exist? basedir
 
       dirs = Dir.glob("#{basedir}/**")
-      if dirs.length == 0
-        raise "No simulators found in #{basedir}."
-      end
+      raise "No simulators found in #{basedir}." if dirs.length.zero?
 
-      return dirs
+      dirs
     end
 
     def ca_interface
-       SimulatorCAInterface.new @sim_dir
+      SimulatorCAInterface.new @sim_dir
     end
 
     def disconnect
@@ -53,8 +51,5 @@ module Idb
     def simulator?
       true
     end
-
-
-
   end
-end
+end

data/lib/lib/simulator_ca_interface.rb

@@ -5,12 +5,10 @@ require_relative 'ca_interface'
 
 module Idb
   class SimulatorCAInterface < CAInterface
-
-    def initialize sim_path
+    def initialize(sim_path)
       @sim_path = sim_path
       @store_path = "/Library/Keychains/TrustStore.sqlite3"
       @db_path = @sim_path + @store_path
     end
-
   end
 end

data/lib/lib/ssh_operations.rb

@@ -6,28 +6,27 @@ module Idb
   class SSHOperations
     attr_accessor :ssh
 
-    def initialize username, password, hostname, port
+    def initialize(username, password, hostname, port)
       @hostname = hostname
       @username = username
       @password = password
       @port = port
-
       $log.info "Establishing SSH Session for #{username}@#{hostname}:#{port}"
+      connect
+    end
 
-      begin
-        @ssh = Net::SSH.start hostname, username, :password => password, :port => port
-
-        # initiali:wze sftp connection and wait until it is open
-        $log.info 'Establishing SFTP Session...'
-        @sftp = Net::SFTP::Session.new @ssh
-        @sftp.loop { @sftp.opening? }
-      rescue Exception => ex
-        $log.error ex.message
-        error = Qt::MessageBox.new
-        error.setInformativeText("SSH connection could not be established: #{ex.message}")
-        error.setIcon(Qt::MessageBox::Critical)
-        error.exec
-      end
+    def connect
+      @ssh = Net::SSH.start @hostname, @username, password: @password, port: @port
+
+      # initialize sftp connection and wait until it is open
+      $log.info 'Establishing SFTP Session...'
+      @sftp = Net::SFTP::Session.new @ssh
+      @sftp.loop { @sftp.opening? }
+    rescue StandardError => ex
+      error = Qt::MessageBox.new
+      error.setInformativeText("SSH connection could not be established: #{ex.message}")
+      error.setIcon(Qt::MessageBox::Critical)
+      error.exec
     end
 
     def disconnect
@@ -35,11 +34,8 @@ module Idb
       @ssh.close
     end
 
-
-    def execute(command, opts={})
-      if opts[:as_user]
-        command = "su - #{ opts[:as_user] } -c \"#{command}\""
-      end
+    def execute(command, opts = {})
+      command = "su - #{opts[:as_user]} -c \"#{command}\"" if opts[:as_user]
 
       if opts[:non_blocking]
         $log.debug "Executing non-blocking SSH command: #{command}"
@@ -50,17 +46,15 @@ module Idb
       end
     end
 
-    def chmod file, permissions
-      @sftp.setstat(file, :permissions => permissions)
+    def chmod(file, permissions)
+      @sftp.setstat(file, permissions: permissions)
     end
 
     def download_recursive(remote_path, local_path)
-      begin
-        @sftp.download! remote_path, local_path, :recursive => true
-      rescue
-        $log.error "Failed to download #{remote_path}."
-        return false
-      end
+      @sftp.download! remote_path, local_path, recursive: true
+    rescue
+      $log.error "Failed to download #{remote_path}."
+      return false
     end
 
     def download(remote_path, local_path = nil)
@@ -71,76 +65,66 @@ module Idb
           @sftp.download! remote_path, local_path
         end
       rescue
-        puts "Error downloading file."
+        $log.error "Error downloading file."
         return false
       end
-      return true
-
+      true
     end
 
     def upload(local_path, remote_path)
       @sftp.upload! local_path, remote_path
     end
 
-    def list_dir dir
-      @sftp.dir.entries(dir).map {|x| x.name}
+    def list_dir(dir)
+      @sftp.dir.entries(dir).map(&:name)
     end
 
-    def list_dir_full dir
+    def list_dir_full(dir)
       @sftp.dir.entries(dir)
     end
 
-
-    def file_exists? path
-      begin
-        @sftp.stat!(path)
-        return true
-      rescue
-        return false
-      end
-
+    def file_exists?(path)
+      @sftp.stat!(path)
+      return true
+    rescue
+      return false
     end
 
-    def launch path
+    def launch(path)
       @ssh.exec path
     end
 
-    def dir_glob path, pattern
-      @sftp.dir.glob(path,pattern).map {|x| "#{path}/#{x.name}"}
+    def dir_glob(path, pattern)
+      @sftp.dir.glob(path, pattern).map { |x| "#{path}/#{x.name}" }
     end
 
-    def mkdir path
+    def mkdir(path)
       @sftp.mkdir path
     end
 
-    def directory? path
-      begin
-        @sftp.stat!(path).directory?
-      rescue
-        nil
-      end
+    def directory?(path)
+      @sftp.stat!(path).directory?
+    rescue
+      nil
     end
 
-    def file? path
-      begin
-        @sftp.stat!(path).file?
-      rescue
-        false
-      end
+    def file?(path)
+      @sftp.stat!(path).file?
+    rescue
+      false
     end
 
-    def mtime path
+    def mtime(path)
       Time.new @sftp.stat!(path).mtime
     end
 
-    def open path
+    def open(path)
       Launchy.open path
     end
 
-    def launch_app command, app
+    def launch_app(command, app)
       puts "#{command} \"#{app}\""
-      self.execute("#{command} \"#{app}\"")
+      execute("#{command} \"#{app}\"")
     end
-
   end
 end

data/lib/lib/ssh_port_forwarder.rb

@@ -1,43 +1,39 @@
 require 'net/ssh'
 require 'log4r'
 
-
 module Idb
   class SSHPortForwarder
-
-    def initialize username, password, hostname, port
+    def initialize(username, password, hostname, port)
       # initialize log
       @log = Log4r::Logger.new 'port_forward'
       outputter = Log4r::Outputter.stdout
-      outputter.formatter =  Log4r::PatternFormatter.new(:pattern => "[%l] %d :: %c :: %m")
+      outputter.formatter = Log4r::PatternFormatter.new(pattern: "[%l] %d :: %c :: %m")
 
-      @log.outputters = [ outputter ]
+      @log.outputters = [outputter]
 
       @log.info 'Establishing SSH port forwarding...'
-      @ssh = Net::SSH.start hostname, username, :password => password, :port => port
+      @ssh = Net::SSH.start hostname, username, password: password, port: port
     end
 
-    def add_local_forward local_port, remote_host, remote_port
+    def add_local_forward(local_port, remote_host, remote_port)
       @log.info " - Forwarding local:#{local_port} -> #{remote_host}:#{remote_port}"
       @ssh.forward.local local_port, remote_host, remote_port
     end
 
-    def add_remote_forward remote_port, local_host, local_port
+    def add_remote_forward(remote_port, local_host, local_port)
       @log.info " - Forwarding remote:#{remote_port} -> #{local_host}:#{local_port}"
       @ssh.forward.remote_to local_port, local_host, remote_port
     end
 
     def start
-      @ssh.loop {
-          true
-        }
+      @ssh.loop do
+        true
+      end
     end
 
     def stop
       $log.info "Closing SSH connection."
       @ssh.close
     end
-
-
   end
 end