Skip to content

Commit

Permalink
Expand the project root assigned to the CP config. Fixes rubymotion-c…
Browse files Browse the repository at this point in the history
  • Loading branch information
alloy committed Jul 3, 2012
1 parent 576b4aa commit 3ef3b01
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 6 deletions.
31 changes: 28 additions & 3 deletions Gemfile.lock
@@ -1,11 +1,36 @@
GEM
remote: http://rubygems.org/
specs:
addressable (2.2.8)
bacon (1.1.0)
cocoapods (0.5.1)
xcodeproj (~> 0.1.0)
cocoapods (0.6.1)
colored (~> 1.2)
escape (~> 0.0.4)
faraday (~> 0.8.1)
json (~> 1.7.3)
octokit (~> 1.7.0)
open4 (~> 1.3.0)
rake (~> 0.9.0)
xcodeproj (~> 0.2.1)
colored (1.2)
escape (0.0.4)
faraday (0.8.1)
multipart-post (~> 1.1)
faraday_middleware (0.8.8)
faraday (>= 0.7.4, < 0.9)
hashie (1.2.0)
json (1.7.3)
multi_json (1.3.6)
multipart-post (1.1.5)
octokit (1.7.0)
addressable (~> 2.2)
faraday (~> 0.8)
faraday_middleware (~> 0.8)
hashie (~> 1.2)
multi_json (~> 1.3)
open4 (1.3.0)
rake (0.9.2.2)
xcodeproj (0.1.0)
xcodeproj (0.2.1)

PLATFORMS
ruby
Expand Down
2 changes: 1 addition & 1 deletion lib/motion/project/cocoapods.rb
Expand Up @@ -63,7 +63,7 @@ def initialize(config)
end
cp_config.rootspec = @podfile unless cocoapods_v06_and_higher?
cp_config.integrate_targets = false if cocoapods_v06_and_higher?
cp_config.project_root = Pathname.new(config.project_dir) + 'vendor'
cp_config.project_root = Pathname.new(File.expand_path(config.project_dir)) + 'vendor'
end

def dependency(*name_and_version_requirements, &block)
Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/spec-repos/master
Submodule master updated 112 files
2 changes: 1 addition & 1 deletion spec/integration_spec.rb
Expand Up @@ -11,6 +11,6 @@

it "successfully builds an application" do
ENV.delete('COCOAPODS_NO_UPDATE')
system("cd '#{@project_dir}' && rake build:simulator").should == true
system("cd '#{@project_dir}' && rake build:simulator --trace").should == true
end
end

0 comments on commit 3ef3b01

Please sign in to comment.