xclisten 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f69f3b387090495b0ceee3e114cd64bf0808d76
-  data.tar.gz: b30d9a0c2a2092f0b445b5f5f7f7c1efa2fbb1fb
+  metadata.gz: c22544587e1cd66bc74c2efc30277fc4585d678b
+  data.tar.gz: 77643232fcda8643ddaf74a60a495e60f7d26342
 SHA512:
-  metadata.gz: b24a0b6b21c8b355eb910c36bd41f4769f4de17eeb6c5d24725e6c7d87fb1eb2e013cb411ce2c41080b050a46d449592275f74150184ad45678c993a3aafb47d
-  data.tar.gz: 6f8f88c59d2d4c508289f041c765d0f2279099bdbf98efa797cb55c513058b51edbd61f2bdafd5a81ce5d1e927522ca29a2e3a7cc2d09c1e7846224836701b58
+  metadata.gz: ae89b027b5536f46e230c65c6eba628de77bc2c2a8e20d6071cfd6cdf117ce68045c0a10eba7932dc17051c03b86d0f77a97afd6a9430d02f7e8c7a0120c5e9f
+  data.tar.gz: 0a3b5d0679bde7510bbfe90aa6c91e4f5d0cee52090ec9c435e8abf8113bcadeaa0030eed11fc9bd2d20964d1e4da8f794c7623923ac12c0ff58696b14172ca3

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+# 0.0.2
+
+##### Bug Fixes
+
+* Kill child processes on Ctrl-C
+
+
+# 0.0.1
+
+* Initial release
+

data/bin/xclisten

@@ -8,21 +8,29 @@ require 'xclisten'
 require 'listen'
 require 'optparse'
 
+@options = {}
+
 OptionParser.new do |opts|
   opts.banner = "Usage: xcodebuild [options] | xcpretty"
   opts.on('--osx', 'Run with OSX sdk (without simulator)') do
-    XCListen::SDK = ''
+    @options[:sdk] = ''
   end
   opts.on('--ios', '[DEFAULT] Run with iOS sdk') do
-    XCListen::SDK = '-sdk iphonesimulator'
+    @options[:sdk] = '-sdk iphonesimulator'
+  end
+  opts.on('-d', '--device', 'Simulated device [iphone5s, iphone5, iphone4]. Default is iphone5s') do |device|
+    @options[:device] = device
+  end
+  opts.on('-s', '--scheme', 'BYOS (Bring your own scheme)') do |scheme|
+    @options[:scheme] = scheme
   end
   opts.on_tail('-h', '--help', 'Show this message') { puts opts; exit }
   opts.on_tail("-v", "--version", "Show version") { puts XCListen::VERSION; exit }
   opts.parse!
 end
 
-pid = fork     { XCListen.listen      }
+pid = fork     { XCListen.new(@options).listen }
 trap("SIGINT") { Process.kill(9, pid) }
 
-Process.waitpid(pid)
+Process.wait(pid)
 

data/lib/xclisten/shell_task.rb

@@ -0,0 +1,13 @@
+class XCListen
+
+  class ShellTask
+
+    def self.run(args)
+      puts args + "\n\n"
+      fork { exec args }
+    end
+
+  end
+
+end
+

data/lib/xclisten/version.rb

@@ -1,3 +1,4 @@
-module XCListen
-  VERSION = "0.0.2"
+class XCListen
+  VERSION = "0.0.3"
 end
+

data/lib/xclisten.rb

@@ -1,22 +1,37 @@
-require "xclisten/version"
+require 'xclisten/version'
+require 'xclisten/shell_task'
 require 'listen'
 
-module XCListen
+class XCListen
 
-  module_function
+  attr_reader :device
+  attr_reader :scheme
+  attr_reader :sdk
 
-  SDK = '-sdk iphonesimulator'
+  def initialize(opts = {})
+    @device = IOS_DEVICES[opts[:device]] || IOS_DEVICES['iphone5s']
+    @scheme = opts[:scheme] || project_name
+    @sdk = opts[:sdk] || 'iphonesimulator'
+  end
+
+  IOS_DEVICES = {
+    'iphone5s' => 'iPhone Retina (4-inch 64-bit)',
+    'iphone5' => 'iPhone Retina (4-inch)',
+    'iphone4' => 'iPhone Retina (3.5-inch)'
+  }
 
+  #TODO: make this recursive
   def workspace_name
     Dir.entries(Dir.pwd).detect { |f| f =~ /.xcworkspace/ }
   end
 
+  #TODO: when workspace_name gets recursive, use `basename`
   def project_name
     workspace_name.split('.').first
   end
 
   def xcodebuild
-    "xcodebuild -workspace #{workspace_name} -scheme #{project_name} #{SDK}"
+    "xcodebuild -workspace #{workspace_name} -scheme #{@scheme} -sdk #{@sdk} -destination 'name=#{@device}'"
   end
 
   def install_pods
@@ -26,9 +41,7 @@ module XCListen
   end
 
   def run_tests
-    task = "#{xcodebuild} test 2> xcodebuild_error.log | xcpretty -tc"
-    puts task + "\n\n"
-    system(task)
+    ShellTask.run("#{xcodebuild} test 2> xcodebuild_error.log | xcpretty -tc")
   end
 
   def listen

data/spec/lib/xclisten_spec.rb

@@ -0,0 +1,59 @@
+require 'xclisten'
+
+class XCListen
+
+  describe XCListen do
+
+    class ShellTask
+      def run(args)
+        @command = args
+      end
+    end
+
+    before(:each) do
+      Dir.stub(:entries).and_return(['SampleProject.xcworkspace'])
+    end
+
+    context "Defaults" do
+
+      before(:each) do
+        @xclisten = XCListen.new
+      end
+
+      it "runs runs tests on iPhone 5s by default" do
+        @xclisten.device.should == 'iPhone Retina (4-inch 64-bit)'
+      end
+
+      it "uses the project name as the default scheme" do
+        @xclisten.scheme.should == 'SampleProject'
+      end
+
+      it "uses iphonesimulator sdk by default" do
+        @xclisten.sdk.should == 'iphonesimulator'
+      end
+
+    end
+
+    it "initializes with device" do
+      xclisten = XCListen.new(:device => 'iphone5')
+      xclisten.device.should == 'iPhone Retina (4-inch)'
+    end
+
+    it "initializes with a different scheme" do
+      xclisten = XCListen.new(:scheme => 'AnotherScheme')
+      xclisten.scheme.should == 'AnotherScheme'
+    end
+
+    it 'initializes with SDK' do
+      xclisten = XCListen.new(:sdk => 'iphonesimulator')
+      xclisten.sdk.should == 'iphonesimulator'
+    end
+
+    it 'uses xcodebuild with given flags' do
+      xclisten = XCListen.new
+      xclisten.xcodebuild.should == "xcodebuild -workspace SampleProject.xcworkspace -scheme SampleProject -sdk iphonesimulator -destination 'name=iPhone Retina (4-inch 64-bit)'"
+    end
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xclisten
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Marin Usalj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -62,13 +62,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/xclisten
 - lib/xclisten.rb
+- lib/xclisten/shell_task.rb
 - lib/xclisten/version.rb
+- spec/lib/xclisten_spec.rb
 - xclisten.gemspec
 homepage: https://github.com/mneorr/xclisten
 licenses:
@@ -94,4 +97,5 @@ rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Run ObjectiveC tests each time you hit save
-test_files: []
+test_files:
+- spec/lib/xclisten_spec.rb