xcskarel 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69158b3f6c2220edec0c74f13e59c1dc1785ae5
-  data.tar.gz: 2584d85e540450a8c65e52ea9f2987a23b93e8e3
+  metadata.gz: 574302ce3ad97095eca2691cdcc2c2b3e36a06cb
+  data.tar.gz: b842efd364ac80cbf6807395f253f747b3edc590
 SHA512:
-  metadata.gz: 2ecc1b825c615c8be675b732a52639553bcdbd34d10200499d70de79dd78bdf7ef82c70d794f5f7b2125cdd7a07d96e09b838de32a6e8e8551aa5cdf73e39833
-  data.tar.gz: 7136da6e5c5d838eb575d54aad6ffbcd060dce1265b0a87b76d9f4adba2e8b41354f306c7c544497c37237892381a1c6852770fb52bc3b1e98b3f8746d2e6b77
+  metadata.gz: 37a86b4a153c96bd64e574555a7795bcbe97743e22c93e0a458362f5a75d8924479cdf16522210138d6831d36404979e1ba347ab36bb9f24cc749a22a1a78062
+  data.tar.gz: a12a031ae0d52e57bc978358386fc0ca10b2725caa609ac88e801b3f3353df4973c49c24638e7112e582d76f5cef5c738230f97ca2f280b47a5a4a81ac747f4b

data/bin/xcskarel

@@ -11,12 +11,16 @@ XCSKarel.set_no_log(true)
 class XCSKarelApplication
   include Commander::Methods
 
-  def add_xcs_options(c)
+  def add_xcs_creds(c)
     c.option '--host Hostname', 'Xcode Server\'s hostname or IP address (default: localhost) (also can be specified as the environment variable XCSKAREL_HOST)'
     c.option '--user Username', 'Xcode Server username (also can be specified as the environment variable XCSKAREL_USER)'
     c.option '--pass Password', 'Xcode Server password (also can be specified as the environment variable XCSKAREL_PASS)'
   end
 
+  def add_xcs_options(c)
+    add_xcs_creds(c)
+  end
+
   def add_bot_options(c)
     c.option '--bot BOT_ID_OR_NAME', '(required) Bot identifier or name'
   end
@@ -26,11 +30,21 @@ class XCSKarelApplication
     c.option '--integration INTEGRATION_ID', 'Integration identifier'
   end
 
-  def create_server_from_options(options)
+  def creds_from_options(options)
     host = options.host || ENV['XCSKAREL_HOST'] || "localhost"
-    user = options.user || ENV['XCSKAREL_USER']
+    user = options.user || ENV['XCSKAREL_USER'] || ENV['USER']
     pass = options.pass || ENV['XCSKAREL_PASS']
-    XCSKarel::Server.new(host, user, pass)
+    return host, user, pass
+  end
+
+  def create_server_from_options(options)
+    creds = creds_from_options(options)
+    XCSKarel::Server.new(*creds)
+  end
+
+  def create_connection_from_options(options)
+    creds = creds_from_options(options)
+    XCSKarel::Remote::Connection.new(*creds)
   end
 
   def run
@@ -184,6 +198,19 @@ class XCSKarelApplication
       end
     end
 
+    # Connecting to an Xcode Server machine
+
+    command :logs do |c|
+      c.syntax = 'xcskarel logs [options]'
+      c.description = 'Gets build and control logs'
+      c.example 'print logs', 'xcskarel logs --host 192.168.1.64 --user honzadvorsky'
+      add_xcs_creds(c)
+      c.action do |args, options|
+        connection = create_connection_from_options(options)
+        XCSKarel::Application.remote_logs(connection)
+      end
+    end
+
     # Managing a local Xcode Server
 
     command :'server start' do |c|

data/lib/xcskarel.rb

@@ -7,3 +7,5 @@ require 'xcskarel/control'
 require 'xcskarel/config'
 require 'xcskarel/xcsfile'
 require 'xcskarel/application'
+require 'xcskarel/shell'
+require 'xcskarel/remote'

data/lib/xcskarel/application.rb

@@ -158,5 +158,21 @@ module XCSKarel
       return out
     end
 
+    def self.remote_logs(connection)
+      logs_path = "/Library/Developer/XcodeServer/Logs"
+      log_control = File.join(logs_path, "xcscontrol.log")
+      log_build = File.join(logs_path, "xcsbuildd.log")
+      lives = []
+      [log_control, log_build].each do |log|
+        puts "\n\n------- Printing output of #{log} at #{connection.host} -------\n".green
+        res = connection.execute("tail -n 20 #{log}")
+        puts res.yellow
+        live = "ssh #{connection.user}@#{connection.host} tail -f #{log}".green
+        lives << live
+      end
+      live_all = lives.map { |l| "\"#{l}\"" }.join("\n")
+      XCSKarel.log.info "To connect to the logs live run either:\n#{live_all}"
+    end
+
   end
 end

data/lib/xcskarel/control.rb

@@ -7,7 +7,7 @@ module XCSKarel
         return nil
       end
 
-      status, output = self.execute('mdfind "kMDItemCFBundleIdentifier == \'com.apple.dt.Xcode\'" 2>/dev/null')
+      status, output = XCSKarel::Shell.execute('mdfind "kMDItemCFBundleIdentifier == \'com.apple.dt.Xcode\'" 2>/dev/null')
       raise "Failed to fetch Xcode paths: #{output}" if status != 0
       output.split("\n")
     end
@@ -19,49 +19,26 @@ module XCSKarel
 
       XCSKarel.log.info "Starting Xcode Server... This may take up to a minute.".yellow
 
-      self.exec_sudo("sudo xcrun xcscontrol --initialize")
-      self.exec_sudo("sudo xcrun xcscontrol --preflight")
+      XCSKarel::Shell.exec_sudo("sudo xcrun xcscontrol --initialize")
+      XCSKarel::Shell.exec_sudo("sudo xcrun xcscontrol --preflight")
       
       XCSKarel.log.info "Xcode Server started & running on localhost now!".green
     end
 
     def self.stop
-      self.exec_sudo("sudo xcrun xcscontrol --shutdown")
+      XCSKarel::Shell.exec_sudo("sudo xcrun xcscontrol --shutdown")
     end
 
     def self.restart
-      self.exec_sudo("sudo xcrun xcscontrol --restart")
+      XCSKarel::Shell.exec_sudo("sudo xcrun xcscontrol --restart")
     end
 
     def self.reset
-      self.exec_sudo("sudo xcrun xcscontrol --reset")
+      XCSKarel::Shell.exec_sudo("sudo xcrun xcscontrol --reset")
     end
 
     def self.select(xcode)
-      self.exec_sudo("sudo xcode-select -s #{xcode}")
-    end
-
-    private
-
-    def self.exec_sudo(script)
-      XCSKarel.log.warn "Running \'#{script}\', so we need root privileges."
-      status, output = self.execute(script)
-      raise "Failed to \'#{script}\':\n#{output}".red if status != 0
-      XCSKarel.log.debug "Script \'#{script}\' output:\n#{output}"
-      return status, output
-    end
-
-    def self.execute(script)
-      exit_status = nil
-      result = []
-      IO.popen(script, err: [:child, :out]) do |io|
-        io.each do |line|
-          result << line.strip
-        end
-        io.close
-        exit_status = $?.exitstatus
-      end
-      [exit_status, result.join("\n")]
+      XCSKarel::Shell.exec_sudo("sudo xcode-select -s #{xcode}")
     end
   end
 end

data/lib/xcskarel/remote.rb

@@ -0,0 +1,48 @@
+module XCSKarel
+  module Remote
+
+    require 'net/ssh'
+
+    # preferably set up SSH keys to be able to SSH into the host
+    # see http://serverfault.com/a/241593 
+    class Connection
+
+      attr_reader :host
+      attr_reader :user
+      attr_reader :pass
+
+      @ssh
+
+      def initialize(host, user, pass)
+        @host = host
+        @user = user
+        @pass = pass
+
+        raise "Invalid host: \"#{host}\"".red if !host || host.empty?
+        raise "Invalid user: \"#{user}\"".red if !user || user.empty?
+
+        connect
+      end
+
+      def connect
+        raise "Already connected".red if @ssh
+        XCSKarel.log.info "Connecting to \"#{@host}\" as user \"#{@user}\" over SSH...".yellow
+        @ssh = Net::SSH.start(host, user, :password => pass)
+      end
+
+      def disconnect
+        @ssh.shutdown!
+        @ssh = nil
+      end
+
+      def execute(script)
+        raise "Not connected yet".red unless @ssh
+        XCSKarel.log.debug "SSH: executing \"#{script}\"".green
+        result = @ssh.exec!(script)
+        result.strip! if result
+        XCSKarel.log.debug "SSH: result\n \"#{result}\"".yellow
+        return result
+      end
+    end
+  end
+end

data/lib/xcskarel/shell.rb

@@ -0,0 +1,25 @@
+module XCSKarel
+  module Shell
+    def self.execute(script)
+      XCSKarel.log.debug "Executing script: \"#{script}\""
+      exit_status = nil
+      result = []
+      IO.popen(script, err: [:child, :out]) do |io|
+        io.each do |line|
+          result << line.strip
+        end
+        io.close
+        exit_status = $?.exitstatus
+      end
+      [exit_status, result.join("\n")]
+    end
+
+    def self.exec_sudo(script)
+      XCSKarel.log.warn "Running \'#{script}\', so we need root privileges."
+      status, output = self.execute(script)
+      raise "Failed to \'#{script}\':\n#{output}".red if status != 0
+      XCSKarel.log.debug "Script \'#{script}\' output:\n#{output}"
+      return status, output
+    end
+  end
+end

data/lib/xcskarel/version.rb

@@ -1,3 +1,3 @@
 module XCSKarel
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcskarel
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Honza Dvorsky
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tool for managing your Xcode Server & Bot configurations from the command
   line
 email: http://honzadvorsky.com
@@ -193,7 +207,9 @@ files:
 - lib/xcskarel/control.rb
 - lib/xcskarel/filter.rb
 - lib/xcskarel/log.rb
+- lib/xcskarel/remote.rb
 - lib/xcskarel/server.rb
+- lib/xcskarel/shell.rb
 - lib/xcskarel/version.rb
 - lib/xcskarel/xcsfile.rb
 - spec/application_spec.rb
@@ -219,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Manage your Xcode Server & Bots from the command line
@@ -227,4 +243,3 @@ test_files:
 - spec/application_spec.rb
 - spec/default_spec.rb
 - spec/filter_spec.rb
-has_rdoc: