Merge branch 'version-0.6' of https://github.com/clearsightstudio/ProMotion into version-0.6

.gitignore

@@ -1,16 +1,25 @@
-/target
-/classes
-/checkouts
-pom.xml
-*.jar
-*.class
-.lein-deps-sum
-.lein-failures
-.lein-plugins
-/build
-.DS_Store
-*.clj
-.rvmrc
 *.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+/build
 .repl_history
-.dat*
+.rvmrc
+.ruby-gemset
+.ruby-version
+.DS_Store
+.dat*

Gemfile

@@ -2,8 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ProMotion.gemspec
 gemspec
-
-# Use this in development
-gem "rake"
-gem "motion-stump"
-gem 'motion-redgreen'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ProMotion (0.6.3)
+    ProMotion (0.6.5)
 
 GEM
   remote: https://rubygems.org/

ProMotion.gemspec

@@ -19,5 +19,8 @@ Gem::Specification.new do |gem|
   gem.name          = "ProMotion"
   gem.require_paths = ["lib"]
   gem.version       = ProMotion::VERSION
-  # gem.add_dependency("motion-table", "~> 0.1.6")
+
+  gem.add_development_dependency("motion-stump")
+  gem.add_development_dependency("motion-redgreen")
+  gem.add_development_dependency("rake")
 end

README.md

@@ -4,6 +4,8 @@
 
 ProMotion is a RubyMotion gem that makes iOS development more like Ruby and less like Objective-C.
 
+Featured on the RubyMotion blog: [http://blog.rubymotion.com/post/50523137515/introducing-promotion-a-full-featured-rubymotion](http://blog.rubymotion.com/post/50523137515/introducing-promotion-a-full-featured-rubymotion)
+
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
 - [ProMotion ](#promotion-)

Rakefile

@@ -1,7 +1,12 @@
 $:.unshift("/Library/RubyMotion/lib")
 require 'motion/project/template/ios'
 require 'bundler'
-Bundler.require
+
+# this follow from gemspec
+Bundler.require(:development)
+
+# this follow development code
+require 'ProMotion'
 
 Motion::Project::App.setup do |app|
   app.name = 'ProMotionTest'

lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "0.6.4" unless defined?(ProMotion::VERSION)
+  VERSION = "0.6.5" unless defined?(ProMotion::VERSION)
 end