pebblex 0.0.5 → 0.0.6

data/README.md

@@ -10,13 +10,13 @@ Unfortunately, there's no development environment for the created project struct
 With the help of `pebblex` you can take advantage of Xcode or [AppCode][AppCode] to develop your Pebble watch faces or apps directly from a convenient IDE.
 The command line tool will create a `.xcodeproj` that contains the needed search paths, resources and .c files to start right away. Each time you build your watch app from the IDE, all warnings and errors of the underlying ´pebble build` command will be presented right in the editor.
 
-With [AppCode][AppCode] you can even build, install the `.pbw` to your watch, and look at the live logs as a one-step action directly from your IDE!
+With [AppCode][AppCode] (or the latest Xcode6-Beta) you can even build, install the `.pbw` to your watch, and look at the live logs as a one-step action directly from your IDE!
 
 ## Installation
 
 Install the Ruby Gem:
 
-    sudo gem install pebblex
+    gem install pebblex
 
 ## Usage
 
@@ -32,7 +32,7 @@ you can easily create an Xcode project file
 
 As part of the project file, `pebblex xcode` will create a target "Pebble" that builds your project right from the IDE. After each build, all warnings and errors will be propagated back right into your editor.
 
-Lucky [AppCode][AppCode] users: `pebblex` automatically creates a run configuration to build, deploy and look at the logs directly from the IDE! Make sure to set `PEBBLE_PHONE` before you push the play button.
+Lucky [AppCode][AppCode] (and now Xcode6-beta) users: `pebblex` automatically creates a run configuration to build, deploy and look at the logs directly from the IDE! Make sure to set `PEBBLE_PHONE` before you push the play button.
 
 ## Contributing
 

data/lib/pebble_x/cli.rb

@@ -31,8 +31,12 @@ module PebbleX
     end
 
     desc "debug", "Loads PBW and logs output from connected watch"
+    option :phone
+    option :pebble_id
     def debug
       pebble = command_helper PebbleX::Pebble
+      pebble.phone = options[:phone] if options[:phone]
+      pebble.pebble_id = options[:pebble_id] if options[:pebble_id]
       exit(pebble.debug)
     end
 

data/lib/pebble_x/monkey_patches.rb

@@ -33,7 +33,7 @@ class Xcodeproj::XCScheme
   alias construct_buildable_name_without_legacy_target construct_buildable_name
 
   def construct_buildable_name_with_legacy_target(build_target)
-    if build_target.isa
+    if build_target.is_a? Xcodeproj::Project::Object::PBXLegacyTarget
       build_target.name
     else
       construct_buildable_name_without_legacy_target build_target

data/lib/pebble_x/pebble.rb

@@ -2,6 +2,8 @@ module PebbleX
   class Pebble
 
     attr_accessor :verbose
+    attr_accessor :phone
+    attr_accessor :pebble_id
 
     def initialize(environment)
       @pebble_cmd = environment.pebble_cmd
@@ -44,8 +46,10 @@ module PebbleX
       sleep(0.5) # phone's Pebble app needs some time before it accepts new connections
     end
 
-    def pebble_call(args)
+    def pebble_call(args, requires_connection=false)
       kill_pebble
+      args += " --phone=#{@phone}" if requires_connection and @phone
+      args += " --pebble_id=#{@pebble_id}" if requires_connection and @pebble_id
       sys_call("#{@pebble_cmd} #{args}")
     end
 
@@ -54,11 +58,11 @@ module PebbleX
     end
 
     def install
-      pebble_call('install')
+      pebble_call('install', true)
     end
 
     def logs
-      pebble_call('logs')
+      pebble_call('logs', true)
     end
 
     def debug

data/lib/pebble_x/version.rb

@@ -1,3 +1,3 @@
 module PebbleX
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/pebble_x/xcode.rb

@@ -65,6 +65,8 @@ module PebbleX
       launch_action = scheme.instance_variable_get :@launch_action
       launch_action.attributes["useCustomWorkingDirectory"] = "YES"
       launch_action.attributes["customWorkingDirectory"] = @directory
+      launch_action.attributes["selectedDebuggerIdentifier"] = ""
+      launch_action.attributes["selectedLauncherIdentifier"] = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       path_runnable = launch_action.add_element "PathRunnable"
       path_runnable.attributes["FilePath"] = @pebblex_cmd
       command_line_arguments = launch_action.add_element "CommandLineArguments"

data/spec/cli_spec.rb

@@ -28,7 +28,7 @@ describe 'CLI' do
     end
   end
 
-  describe 'build' do
+  describe 'debug' do
     it 'delegates to pebble debug' do
       pebble = double 'pebble'
       expect(pebble).to receive(:debug).and_return 23
@@ -38,6 +38,31 @@ describe 'CLI' do
       expect(c).to receive(:exit).with(23)
       c.debug
     end
+
+    it 'passes --phone to pebble debug' do
+      pebble = double 'pebble'
+      expect(pebble).to receive(:phone=).with "1234"
+      expect(pebble).to receive(:debug).and_return 23
+
+      c = PebbleX::CLI.new
+      expect(c).to receive(:command_helper).with(PebbleX::Pebble).and_return(pebble)
+      allow(c).to receive(:options).and_return({:phone => "1234"})
+      expect(c).to receive(:exit).with(23)
+      c.debug
+    end
+
+    it 'passes --pebble_id to pebble debug' do
+      pebble = double 'pebble'
+      expect(pebble).to receive(:pebble_id=).with "some_id"
+      expect(pebble).to receive(:debug).and_return 23
+
+      c = PebbleX::CLI.new
+      expect(c).to receive(:command_helper).with(PebbleX::Pebble).and_return(pebble)
+      allow(c).to receive(:options).and_return({:pebble_id => "some_id"})
+      expect(c).to receive(:exit).with(23)
+      c.debug
+    end
+
   end
 
   describe 'pebble_cmd' do

data/spec/pebble_spec.rb

@@ -22,6 +22,33 @@ describe 'Pebble' do
       expect(p).to receive(:sys_call).with('path/to/pebble foo')
       p.pebble_call('foo')
     end
+
+    it 'ignores phone and pebble-id if no connection required' do
+      p = PebbleX::Pebble.new(e)
+      p.phone = 'phone'
+      p.pebble_id = 'pebble_id'
+      expect(p).to receive(:kill_pebble)
+      expect(p).to receive(:sys_call).with('path/to/pebble foo')
+      p.pebble_call('foo', false)
+    end
+
+    it 'passes phone if connection required' do
+      p = PebbleX::Pebble.new(e)
+      p.phone = '1234'
+      expect(p).to receive(:kill_pebble)
+      expect(p).to receive(:sys_call).with('path/to/pebble foo --phone=1234')
+      p.pebble_call('foo', true)
+    end
+
+    it 'passes pebble-id if connection required' do
+      p = PebbleX::Pebble.new(e)
+      p.pebble_id = 'some_id'
+      expect(p).to receive(:kill_pebble)
+      expect(p).to receive(:sys_call).with('path/to/pebble foo --pebble_id=some_id')
+      p.pebble_call('foo', true)
+    end
+
+
   end
 
   describe 'debug' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblex
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -177,3 +177,4 @@ test_files:
 - spec/fixtures/project_with_js/wscript
 - spec/pebble_spec.rb
 - spec/xcode_spec.rb
+has_rdoc: