xcskarel 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 596429a302f978c050207421ed3dcbffe6316499
-  data.tar.gz: 7fa499fa10d1a52acbca082d47658fb22cf353c9
+  metadata.gz: 46caf18dae4a7b9335230829b1edba21c99dff79
+  data.tar.gz: 52c0f1bee03ed2258867e1ba230c0bbe18810260
 SHA512:
-  metadata.gz: b9d3191508ab7c90f0b716e170898685cdf4452630a6815e6d895364713b2e63be5f71257a2cdfdacfcfb000fc8176822d1c91bb8a0d81f12fa0f00a4101b81d
-  data.tar.gz: 775517502ac9242ddfa469beb99221bd672fed07178362f5fe11de2d0f0f2bd084ad6ce20895bc39085c57414b35b32015fef5299aab3feb3a9236e3b251b53a
+  metadata.gz: 5bf83f4ed608340216a8eb86933d2495561369a2fc04d3301f9792fa615f2b066570e4e44a31b9f574da74b8fde50efb154028a4dae88f6a59459b08f00a36d1
+  data.tar.gz: 1e9a267e1b92508c74b621209150b8fa39de410a9913e7df08a5e63a62c3ae58fb6c45db57f51a164accf3473ee7522a06165dd5cb56aba8e6f77939d6911218

data/bin/xcskarel

@@ -2,7 +2,7 @@
 
 $LOAD_PATH.push File.expand_path('../../lib', __FILE__)
 
-require 'xcskarel'
+require 'XCSKarel'
 require 'rubygems'
 require 'commander'
 
@@ -12,14 +12,14 @@ class XCSKarelApplication
   include Commander::Methods
 
   def add_xcs_options(c)
-    c.option '--host Hostname', '(required) Xcode Server\'s hostname or IP address'
+    c.option '--host Hostname', '(required) Xcode Server\'s hostname or IP address (default: localhost)'
     c.option '--user Username', 'Xcode Server username'
     c.option '--pass Password', 'Xcode Server password'
   end
 
   def create_server_from_options(options)
-    raise "No hostname was specified, please see `xcskarel --help`" unless options.host
-    XCSKarel::Server.new(options.host, options.user, options.pass)
+    host = options.host || "localhost"
+    XCSKarel::Server.new(host, options.user, options.pass)
   end
 
   def run
@@ -42,9 +42,13 @@ class XCSKarelApplication
       c.action do |args, options|
         server = create_server_from_options(options)
         all_bots = server.get_bots
+        # create Bot instances
+        bot_objs = all_bots.map { |json| XCSKarel::Bot.new(json) }
+        bot_files = bot_objs.map { |bot| name = "./xcskarel/#{bot.json['_id']}.json"; bot.to_file(name); name }
         unless options.no_filter
-          all_bots = XCSKarel.filter_array(all_bots, ['name', '_id'])
+          all_bots = XCSKarel::Filter.filter_key_paths(all_bots, ['name', '_id'])
         end
+        binding.pry
         out = options.no_pretty ? JSON.generate(all_bots) : JSON.pretty_generate(all_bots)
         puts out
       end
@@ -61,7 +65,7 @@ class XCSKarelApplication
         server = create_server_from_options(options)
         all_integrations = server.get_integrations(options.bot)
         unless options.no_filter
-          all_integrations = XCSKarel.filter_array(all_integrations, ['number', '_id', 'currentStep', 'result'])
+          all_integrations = XCSKarel::Filter.filter_key_paths(all_integrations, ['number', '_id', 'currentStep', 'result'])
         end
         out = options.no_pretty ? JSON.generate(all_integrations) : JSON.pretty_generate(all_integrations)
         puts out
@@ -77,7 +81,7 @@ class XCSKarelApplication
         server = create_server_from_options(options)
         all_health = server.get_health
         unless options.no_filter
-          all_health = XCSKarel.filter_key_paths(all_health, ['uptime'])
+          all_health = XCSKarel::Filter.filter_key_paths(all_health, ['uptime'])
         end
         out = options.no_pretty ? JSON.generate(all_health) : JSON.pretty_generate(all_health)
         puts out

data/lib/xcskarel/bot.rb

@@ -0,0 +1,23 @@
+module XCSKarel
+  class Bot
+    attr_reader :json
+    def initialize(json)
+      @json = json
+    end
+
+    def self.from_file(file_path)
+      abs_path = File.absolute_path(file_path)
+      raise "No file #{abs_path}" unless File.exist?(abs_path)
+      self.new(File.read(abs_path))
+    end
+
+    def to_file(file_path="./xcskarel/bot.json")
+      abs_path = File.absolute_path(file_path)
+      raise "File #{abs_path} already exists." if File.exist?(abs_path)
+      FileUtils.mkdir_p(File.dirname(abs_path))
+      File.open(abs_path, 'w') do |f|  
+        f.puts JSON.pretty_generate(@json) + "\n"
+      end  
+    end
+  end
+end

data/lib/xcskarel/filter.rb

@@ -0,0 +1,49 @@
+
+require 'set'
+
+module XCSKarel
+  module Filter
+    # returns a copy of the passed-in hash with only the provided keypaths kept
+    # e.g. "name" will keep the key "name" at the top level.
+    # supports even nested keypaths
+    def self.filter_key_paths(object, key_paths)
+
+      # array?
+      if object.is_a?(Array)
+        return self.filter_array(object, key_paths)
+      end
+
+      # hash?
+      if object.is_a?(Hash)
+        new_hash = Hash.new
+        unique_key_paths = Set.new(key_paths)
+        object.each do |k,v|
+
+          keys = k.split('.') # key-paths must be separated by a period
+          match = unique_key_paths.select do |key|
+            key.split('.').first == keys.first
+          end.first
+          if match
+            new_hash[keys.first] = filter_key_paths(v, match.split('.').drop(1))
+          end
+        end
+        return new_hash
+      end
+
+      # object?
+      return object
+    end
+
+    private
+
+    # filters each element
+    def self.filter_array(array, key_paths)
+      new_array = Array.new
+      keys = Set.new(key_paths)
+      array.each do |i|
+        new_array << filter_key_paths(i, key_paths)
+      end
+      return new_array
+    end
+  end
+end

data/lib/{karel → xcskarel}/server.rb

@@ -1,6 +1,5 @@
 require 'excon'
-require 'pry'
-require 'karel/log'
+require 'xcskarel/log'
 require 'json'
 require 'base64'
 

data/lib/{karel → xcskarel}/version.rb

@@ -1,3 +1,3 @@
 module XCSKarel
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/xcskarel.rb

@@ -1,6 +1,7 @@
 
-require 'karel/server'
-require 'karel/version'
-require 'karel/log'
-require 'karel/filter'
-require 'karel/control'
+require 'xcskarel/server'
+require 'xcskarel/version'
+require 'xcskarel/log'
+require 'xcskarel/filter'
+require 'xcskarel/control'
+require 'xcskarel/bot'

data/spec/default_spec.rb

@@ -0,0 +1,11 @@
+require 'xcskarel'
+
+describe XCSKarel do
+  describe XCSKarel::Control do
+    describe "blah" do
+      it "is happy" do
+        expect("a").to eq("a")
+      end
+    end
+  end
+end

data/spec/filter_spec.rb

@@ -0,0 +1,63 @@
+require 'xcskarel/filter'
+
+describe XCSKarel do
+  describe XCSKarel::Filter do
+
+    def test(inObj, key_paths)
+      XCSKarel::Filter.filter_key_paths(inObj, key_paths)
+    end
+
+    it "handles empty hash" do
+      expect(test({}, [])).to eq({})
+    end
+
+    it "handles empty array" do
+      expect(test([], [])).to eq([])
+    end
+
+    it "handles flat array of strings" do
+      expect(test(["apples", "oranges"], [])).to eq(["apples", "oranges"])
+    end
+
+    it "filters out everything from a simple hash" do
+      expect(test({"apples" => "green", "oranges" => "orange"}, [])).to eq({})
+    end
+
+    it "lets through only selected keys is a simple hash" do
+      expect(test({"apples" => "green", "oranges" => "orange"}, ["oranges"])).to eq({"oranges" => "orange"})
+    end
+
+    it "handles basic key path with a hash" do
+      obj = {
+        "apples" => "green",
+        "oranges" => {
+          "new" => 2,
+          "old" => -2
+        }
+      }
+      exp = {
+        "oranges" => {
+          "old" => -2
+        }
+      }
+      expect(test(obj, ["oranges.old"])).to eq(exp)
+    end
+
+    it "handles basic key path with an array without popping the key path" do
+      obj = [
+        "apples",
+        {
+          "new" => 2,
+          "old" => -2
+        }
+      ]
+      exp = [
+        "apples",
+        {
+          "new" => 2
+        }
+      ]
+      expect(test(obj, ["new"])).to eq(exp)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcskarel
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Honza Dvorsky
@@ -108,6 +108,62 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: fastlane
+  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
@@ -117,12 +173,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/xcskarel
-- lib/karel/control.rb
-- lib/karel/filter.rb
-- lib/karel/log.rb
-- lib/karel/server.rb
-- lib/karel/version.rb
 - lib/xcskarel.rb
+- lib/xcskarel/bot.rb
+- lib/xcskarel/control.rb
+- lib/xcskarel/filter.rb
+- lib/xcskarel/log.rb
+- lib/xcskarel/server.rb
+- lib/xcskarel/version.rb
+- spec/default_spec.rb
+- spec/filter_spec.rb
 homepage: http://github.com/czechboy0/xcskarel
 licenses:
 - MIT
@@ -147,5 +206,7 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Manage your Xcode Server & Bots from the command line
-test_files: []
+test_files:
+- spec/default_spec.rb
+- spec/filter_spec.rb
 has_rdoc: 

data/lib/karel/filter.rb

@@ -1,28 +0,0 @@
-
-require 'set'
-
-module XCSKarel
-  # returns a copy of the passed-in hash with only the provided keypaths kept
-  # e.g. "name" will keep the key "name" at the top level.
-  # TODO: support even nested keypaths
-  def self.filter_key_paths(hash, key_paths)
-    new_hash = Hash.new
-    keys = Set.new(key_paths)
-    hash.each do |k,v|
-      if keys.member?(k)
-        new_hash[k] = v
-      end
-    end
-    return new_hash
-  end
-
-  # filters each element
-  def self.filter_array(array, key_paths)
-    new_array = Array.new
-    keys = Set.new(key_paths)
-    array.each do |i|
-      new_array << filter_key_paths(i, key_paths)
-    end
-    return new_array
-  end
-end