pebblex 0.0.4 → 0.0.5

data/README.md

@@ -1,17 +1,16 @@
-# PebbleX [![Build Status](https://travis-ci.org/HBehrens/pebblex.png)](https://travis-ci.org/HBehrens/pebblex)
+# PebbleX [![Build Status](https://travis-ci.org/HBehrens/pebblex.png)](https://travis-ci.org/HBehrens/pebblex)[![Gem Version](https://badge.fury.io/rb/pebblex.png)](http://badge.fury.io/rb/pebblex)
 
-A small command line tool to add functionality the `pebble` command is missing right now.
-Ideally, there will be no need for `pebblex` in the future, anymore.
+A small command line tool to use Xcode and [AppCode][AppCode] as development environment for the [Pebble smartwatch SDK](https://developer.getpebble.com/2/). It's based on the SDK's official `pebble` command that steadily evolves and might contain some of the functionality `pebblex` introduces by itself in the future. Ideally, there will be no need for `pebblex` at some point, anymore.
 
 ## Background
 
 The [Pebble SDK](https://developer.getpebble.com/2/) comes with a powerful command line tool `pebble` to create, build and analyze pebble projects.
 Unfortunately, there's no development environment for the created project structure.
 
-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.
+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] 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
 
@@ -21,30 +20,26 @@ Install the Ruby Gem:
 
 ## Usage
 
-After creating a new pebble project 
+After creating a new pebble project (as described in the [Pebble tutorial](https://developer.getpebble.com/2/getting-started/hello-world/))
 
-    pebble new-project myproject --javascript
+    pebble new-project hello_world
+    cd hello_world
     
-you can easily create xcode project file 
+you can easily create an Xcode project file 
 
-    cd myproject
     pebblex xcode
-    open myproject.xcodeproj
+    open hello_world.xcodeproj
 
-The `pebblex xcode` command will also 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.
+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.
 
-
-### Optional: AppCode
-
-If you are using, [AppCode](AppCode) you can even deploy and look at the logs directly from the IDE! Make these adjustments to the run configuration to do so:
-
-![alt tag](https://raw.github.com/HBehrens/pebblex/master/images/AppCodeRunConfig.png)
+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.
 
 ## Contributing
 
 1. Fork it ( https://github.com/HBehrens/pebblex/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Build and test PebbleX locally (`rake build && rake install`)
+3. Make sure to test your changes (`rake spec`)
+3. Build and try PebbleX locally (`rake build && rake install`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request

data/lib/pebble_x.rb

@@ -2,6 +2,7 @@ require 'pebble_x/version'
 require 'pebble_x/cli'
 require 'pebble_x/xcode'
 require 'pebble_x/pebble'
+require 'pebble_x/monkey_patches'
 
 module PebbleX
 end

data/lib/pebble_x/cli.rb

@@ -18,7 +18,7 @@ module PebbleX
     end
     map %w(-v --version) => :version
 
-    desc "xcode", "Creates and Xcode project file"
+    desc "xcode", "Creates an Xcode project file"
     def xcode
       xcode = command_helper PebbleX::Xcode
       xcode.create_project
@@ -83,4 +83,4 @@ module PebbleX
 
   end
 
-end
+end

data/lib/pebble_x/monkey_patches.rb

@@ -0,0 +1,45 @@
+require 'xcodeproj'
+require 'xcodeproj/scheme'
+
+class Xcodeproj::XCScheme::XML_Fromatter
+  def write_element(node, output)
+    @indentation = 3
+    output << ' '*@level
+    output << "<#{node.expanded_name}"
+
+    @level += @indentation
+    node.attributes.each_attribute do |attr|
+      output << "\n"
+      output << ' '*@level
+      output << attr.to_string.sub(/=/, ' = ') # here's the patch (sub instead of gsub)
+    end unless node.attributes.empty?
+
+    output << ">"
+
+    output << "\n"
+    node.children.each { |child|
+      next if child.kind_of?(REXML::Text) and child.to_s.strip.length == 0
+      write(child, output)
+      output << "\n"
+    }
+    @level -= @indentation
+    output << ' '*@level
+    output << "</#{node.expanded_name}>"
+  end
+end
+
+
+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
+      build_target.name
+    else
+      construct_buildable_name_without_legacy_target build_target
+    end
+  end
+
+  alias construct_buildable_name construct_buildable_name_with_legacy_target
+
+end

data/lib/pebble_x/version.rb

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

data/lib/pebble_x/xcode.rb

@@ -22,7 +22,9 @@ module PebbleX
 
       Dir.chdir(@directory) # TODO: popd at the end of this method
 
-      project = Xcodeproj::Project.new(@project_name+'.xcodeproj')
+      project_filename = @project_name+'.xcodeproj'
+      puts "Creating #{project_filename}"
+      project = Xcodeproj::Project.new(project_filename)
 
       # will add pebble sdk headers and build/src/resource_ids.auto.h to search path
       project.build_configuration_list.set_setting('HEADER_SEARCH_PATHS', [File.join(@pebble_sdk_dir, 'Pebble/include'), 'build'])
@@ -57,6 +59,24 @@ module PebbleX
       # clean up xcode project ('products' group must remain due to fake iOS target)
       project.frameworks_group.remove_from_project
 
+      # run configuration for Pebble target
+      scheme = Xcodeproj::XCScheme.new
+      scheme.add_build_target legacy_target
+      launch_action = scheme.instance_variable_get :@launch_action
+      launch_action.attributes["useCustomWorkingDirectory"] = "YES"
+      launch_action.attributes["customWorkingDirectory"] = @directory
+      path_runnable = launch_action.add_element "PathRunnable"
+      path_runnable.attributes["FilePath"] = @pebblex_cmd
+      command_line_arguments = launch_action.add_element "CommandLineArguments"
+      command_line_argument = command_line_arguments.add_element "CommandLineArgument"
+      command_line_argument.attributes["argument"] = "debug --pebble_sdk=#{@pebble_sdk_dir}"
+      command_line_argument.attributes["isEnabled"] = "YES"
+      # remove unneeded elements
+      for s in [:@test_action, :@profile_action].each do
+        scheme.doc.elements[1].delete_element(scheme.instance_variable_get s)
+      end
+      scheme.save_as(project.path, legacy_target.name, false)
+
       project.save
 
       project

data/pebblex.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = PebbleX::VERSION
   spec.authors       = ["Heiko Behrens"]
   spec.email         = ["HeikoBehrens@gmx.de"]
-  spec.summary       = %q{Some additions to the pebble CLI.}
-  spec.description   = %q{For now, it can create and Xcode project from a pebble dir. In future, some other convenience commands will be added.}
+  spec.summary       = %q{Enables Pebble development with Xcode and AppCode.}
+  spec.description   = %q{Creates an Xcode project from a pebble project 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 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!}
   spec.homepage      = "https://github.com/hbehrens/pebblex"
   spec.license       = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblex
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -107,8 +107,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: For now, it can create and Xcode project from a pebble dir. In future,
-  some other convenience commands will be added.
+description: Creates an Xcode project from a pebble project 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 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!
 email:
 - HeikoBehrens@gmx.de
 executables:
@@ -124,9 +128,9 @@ files:
 - README.md
 - Rakefile
 - bin/pebblex
-- images/AppCodeRunConfig.png
 - lib/pebble_x.rb
 - lib/pebble_x/cli.rb
+- lib/pebble_x/monkey_patches.rb
 - lib/pebble_x/pebble.rb
 - lib/pebble_x/version.rb
 - lib/pebble_x/xcode.rb
@@ -163,7 +167,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Some additions to the pebble CLI.
+summary: Enables Pebble development with Xcode and AppCode.
 test_files:
 - spec/cli_spec.rb
 - spec/fixtures/project_with_js/.gitignore