xclisten 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22544587e1cd66bc74c2efc30277fc4585d678b
-  data.tar.gz: 77643232fcda8643ddaf74a60a495e60f7d26342
+  metadata.gz: 374baf4cf8e109c0bcce7da6a8a6424129c79a05
+  data.tar.gz: 99060e03939a3eb604eea4fab5e024b0ef78ec14
 SHA512:
-  metadata.gz: ae89b027b5536f46e230c65c6eba628de77bc2c2a8e20d6071cfd6cdf117ce68045c0a10eba7932dc17051c03b86d0f77a97afd6a9430d02f7e8c7a0120c5e9f
-  data.tar.gz: 0a3b5d0679bde7510bbfe90aa6c91e4f5d0cee52090ec9c435e8abf8113bcadeaa0030eed11fc9bd2d20964d1e4da8f794c7623923ac12c0ff58696b14172ca3
+  metadata.gz: de764a81432718f40e53d2633ec49d36adb102085f32d418eb4f5efa20372d47d7afc25d15a6b56975b2d29eeb1e366e1213636e0e28e29ca85047a860b564a6
+  data.tar.gz: db901ec8e72df859f299c563ed06d14ab66f3a730f7da85a4e0093702654f18f35a9fe65ded12825becbed4c2845aef3a06f41e7758a82a132029501190378ef

data/.gitmodules

@@ -0,0 +1,12 @@
+[submodule "fixtures/ReactiveCocoa"]
+	path = fixtures/ReactiveCocoa
+	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
+[submodule "fixtures/Kiwi"]
+	path = fixtures/Kiwi
+	url = https://github.com/allending/Kiwi.git
+[submodule "fixtures/ObjectiveRecord"]
+	path = fixtures/ObjectiveRecord
+	url = https://github.com/mneorr/ObjectiveRecord.git
+[submodule "fixtures/AFNetworking"]
+	path = fixtures/AFNetworking
+	url = https://github.com/AFNetworking/AFNetworking.git

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm: 2.1.0
+script: rake ci
+

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+# 0.0.4
+
+##### Enhancements
+
+* Search for `.xcworkspace` recursively |
+  [Delisa Mason](https://github.com/kattrali) |
+  [#8](https://github.com/mneorr/xclisten/pull/8)
+* Added some tests and CI integration \o/
+* Added `--workspace -w` flag to specify a custom workspace location
+* Specified `macosx` sdk rather than nothing on OSX builds
+
+
+# 0.0.3
+
+##### Enhancements
+
+* Use lower-level fork and exec for spawning xcodebuild
+* Support for custom schemes
+* Support for custom devices (iphone5s, iphone5, iphone4)
+
 # 0.0.2
 
 ##### Bug Fixes

data/README.md

@@ -1,4 +1,5 @@
 # XCListen
+[![Build Status](https://travis-ci.org/mneorr/xclisten.png?branch=master)](https://travis-ci.org/mneorr/xclisten)
 
 A zero-configuration filesystem watcher for ObjectiveC. It determines your workspace and scheme automatically, and:
 
@@ -25,6 +26,17 @@ Simple, huh?
 
 If you have an OSX project, you'll want to run it with `--osx` flag.
 
+## Flags
+
+``` bash
+Usage: xclisten [optional flags]
+        --osx                        Run with OSX sdk (without simulator)
+        --ios                        [DEFAULT] Run with iOS sdk
+    -d, --device                     Simulated device [iphone5s, iphone5, iphone4]. Default is iphone5s
+    -s, --scheme                     BYOS (Bring your own scheme)
+    -h, --help                       Show this message
+    -v, --version                    Show version
+```
 
 ## Something went wrong!
 
@@ -32,6 +44,5 @@ No worries, just `tail -f xcodebuild_error.log` and let us know what's happening
 
 ## TODO
 
-- Device flag (choose between iphone5s, iPad, iPad Air,...)
 - Support non-cocoapods projects, when there's no .xcworkspace
 - Acceptance tests

data/Rakefile

@@ -1 +1,15 @@
 require "bundler/gem_tasks"
+
+task :spec do
+  sh 'rspec spec --color --format nested'
+end
+
+task :cucumber do
+  sh 'cucumber'
+end
+
+task :ci do
+  Rake::Task[:spec].invoke
+  #Rake::Task[:cucumber].invoke
+end
+

data/bin/xclisten

@@ -11,19 +11,22 @@ require 'optparse'
 @options = {}
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: xcodebuild [options] | xcpretty"
+  opts.banner = "Usage: xclisten [optional flags]"
   opts.on('--osx', 'Run with OSX sdk (without simulator)') do
-    @options[:sdk] = ''
+    @options[:sdk] = 'macosx'
   end
   opts.on('--ios', '[DEFAULT] Run with iOS sdk') do
-    @options[:sdk] = '-sdk iphonesimulator'
+    @options[: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|
+  opts.on('-s', '--scheme SCHEME', 'BYOS (Bring your own scheme)') do |scheme|
     @options[:scheme] = scheme
   end
+  opts.on('-w', '--workspace WORKSPACE', 'BYOW (Bring your own workspace)') do |workspace|
+    @options[:workspace] = workspace
+  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!
@@ -31,6 +34,5 @@ end
 
 pid = fork     { XCListen.new(@options).listen }
 trap("SIGINT") { Process.kill(9, pid) }
-
 Process.wait(pid)
 

data/lib/xclisten/version.rb

@@ -1,4 +1,4 @@
 class XCListen
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 

data/lib/xclisten.rb

@@ -7,11 +7,13 @@ class XCListen
   attr_reader :device
   attr_reader :scheme
   attr_reader :sdk
+  attr_reader :workspace
 
   def initialize(opts = {})
     @device = IOS_DEVICES[opts[:device]] || IOS_DEVICES['iphone5s']
     @scheme = opts[:scheme] || project_name
     @sdk = opts[:sdk] || 'iphonesimulator'
+    @workspace = opts[:workspace] || workspace_path
   end
 
   IOS_DEVICES = {
@@ -20,31 +22,45 @@ class XCListen
     'iphone4' => 'iPhone Retina (3.5-inch)'
   }
 
-  #TODO: make this recursive
-  def workspace_name
-    Dir.entries(Dir.pwd).detect { |f| f =~ /.xcworkspace/ }
+  def workspace_path
+    @workspace_path ||= Dir.glob("**/*.xcworkspace").select {|p| !p.include? "xcodeproj"}.first
   end
 
-  #TODO: when workspace_name gets recursive, use `basename`
   def project_name
-    workspace_name.split('.').first
+    File.basename(workspace_path, ".*") if workspace_path
   end
 
   def xcodebuild
-    "xcodebuild -workspace #{workspace_name} -scheme #{@scheme} -sdk #{@sdk} -destination 'name=#{@device}'"
+    "xcodebuild -workspace #{@workspace} -scheme #{@scheme} -sdk #{@sdk} -destination 'name=#{@device}'"
   end
 
   def install_pods
-    system 'pod install'
-    puts 'Giving Xcode some time to index...'
-    sleep 10
+    Dir.chdir(File.dirname(workspace_path)) do
+      system 'pod install'
+      puts 'Giving Xcode some time to index...'
+      sleep 10
+    end
   end
 
   def run_tests
     ShellTask.run("#{xcodebuild} test 2> xcodebuild_error.log | xcpretty -tc")
   end
 
+  #TODO TEST THIS SPIKE
+  def validate_run
+    unless can_run?
+      puts "[!] No xcworkspace found in this directory (or any child directories)"
+      exit 1
+    end
+  end
+
+  def can_run?
+    project_name && !project_name.empty?
+  end
+
   def listen
+    validate_run
+    puts "Started xclistening to #{workspace_path}"
     ignored = [/.git/, /.xc(odeproj|workspace|userdata|scheme|config)/, /.lock$/, /\.txt$/, /\.log$/]
 
     listener = Listen.to(Dir.pwd, :ignore => ignored) do |modified, added, removed|

data/spec/lib/xclisten_spec.rb

@@ -10,13 +10,10 @@ class XCListen
       end
     end
 
-    before(:each) do
-      Dir.stub(:entries).and_return(['SampleProject.xcworkspace'])
-    end
-
     context "Defaults" do
 
       before(:each) do
+        Dir.stub(:glob).and_return(['SampleProject.xcworkspace'])
         @xclisten = XCListen.new
       end
 
@@ -28,6 +25,10 @@ class XCListen
         @xclisten.scheme.should == 'SampleProject'
       end
 
+      it "uses the first found workspace by default" do
+        @xclisten.workspace.should == 'SampleProject.xcworkspace'
+      end
+
       it "uses iphonesimulator sdk by default" do
         @xclisten.sdk.should == 'iphonesimulator'
       end
@@ -39,6 +40,11 @@ class XCListen
       xclisten.device.should == 'iPhone Retina (4-inch)'
     end
 
+    it "initializes with a different workspace" do
+      xclisten = XCListen.new(:workspace => 'Example/Sample.xcworkspace')
+      xclisten.workspace.should == 'Example/Sample.xcworkspace'
+    end
+
     it "initializes with a different scheme" do
       xclisten = XCListen.new(:scheme => 'AnotherScheme')
       xclisten.scheme.should == 'AnotherScheme'
@@ -50,8 +56,41 @@ class XCListen
     end
 
     it 'uses xcodebuild with given flags' do
+      flags = {
+        :workspace => 'Example/Sample.xcworkspace',
+        :scheme => 'kif',
+        :sdk => 'macosx',
+        :device => 'name=iPhone Retina (4-inch 64-bit)'
+      }
+      xclisten = XCListen.new(flags)
+      xclisten.xcodebuild.should == "xcodebuild -workspace #{flags[:workspace]} -scheme #{flags[:scheme]} -sdk #{flags[:sdk]} -destination '#{flags[:device]}'"
+    end
+
+    it "knows if it can run" do
+      Dir.stub(:glob).and_return([""])
       xclisten = XCListen.new
-      xclisten.xcodebuild.should == "xcodebuild -workspace SampleProject.xcworkspace -scheme SampleProject -sdk iphonesimulator -destination 'name=iPhone Retina (4-inch 64-bit)'"
+      xclisten.can_run?.should be_false
+    end
+
+    context "finding the right workspace" do
+
+      before(:all) do
+        @base_dir = Dir.pwd
+      end
+
+      after(:each) do
+        Dir.chdir(@base_dir)
+      end
+
+      it "works with one level deep workspace" do
+        Dir.chdir('fixtures/ObjectiveRecord')
+        XCListen.new.workspace.should == 'Example/SampleProject.xcworkspace'
+      end
+
+      it "works with xcworkspace in the same directory" do
+        Dir.chdir('fixtures/AFNetworking')
+        XCListen.new.workspace.should == 'AFNetworking.xcworkspace'
+      end
     end
   end
 

data/xclisten.gemspec

@@ -15,12 +15,14 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features|fixtures)/})
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "listen", "~> 2.4"
   spec.add_runtime_dependency "xcpretty", "~> 0.1"
 
   spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xclisten
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Marin Usalj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
 description: Zero configuration file watcher for Objective-C that runs tests, installs
   Pods each time you save a file
 email:
@@ -62,6 +90,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -99,3 +129,4 @@ specification_version: 4
 summary: Run ObjectiveC tests each time you hit save
 test_files:
 - spec/lib/xclisten_spec.rb
+has_rdoc: