CocoaPods · Jul 1, 2012 · Jul 2, 2012 · Jul 2, 2012 · Jul 2, 2012 · Jul 2, 2012
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -352,5 +352,5 @@ allowing you to automate Xcode related tasks.
 [3]: https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/podfile.rb#L185
 [4]: https://github.com/CocoaPods/Xcodeproj
 [5]: https://github.com/tomaz/appledoc
-[6]: https://github.com/CocoaPods/CocoaPods/compare/0.5.1...HEAD
+[6]: https://github.com/CocoaPods/CocoaPods/compare/0.5.1...0.6.0
 [7]: https://github.com/CocoaPods/CocoaPods/compare/0.3.10...0.5.0
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,22 +1,22 @@
 GIT
   remote: git://github.com/CocoaPods/Xcodeproj.git
-  revision: 4c49ed5c0fb4f021b73afd69515ac4aec1765f81
+  revision: 4042ea00c560f806807bc0a8ad2a8761102d40d8
   branch: develop
   specs:
-    xcodeproj (0.2.0)
+    xcodeproj (0.2.1)
 
 PATH
   remote: .
   specs:
-    cocoapods (0.6.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.0)
+      xcodeproj (~> 0.2.1)
 
 GEM
   remote: http://rubygems.org/
@@ -32,11 +32,16 @@ GEM
       multipart-post (~> 1.1)
     faraday_middleware (0.8.8)
       faraday (>= 0.7.4, < 0.9)
+    ffi (1.0.11)
     github-markup (0.7.2)
     hashie (1.2.0)
     json (1.7.3)
-    kicker (2.5.0)
-      rb-fsevent
+    kicker (2.6.0)
+      listen
+    listen (0.4.7)
+      rb-fchange (~> 0.0.5)
+      rb-fsevent (~> 0.9.1)
+      rb-inotify (~> 0.8.8)
     metaclass (0.0.1)
     method_source (0.7.1)
     mocha (0.11.4)
@@ -57,7 +62,11 @@ GEM
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
     rake (0.9.2.2)
+    rb-fchange (0.0.5)
+      ffi
     rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     redcarpet (2.1.1)
     slop (2.4.4)
     vcr (2.2.2)

diff --git a/Rakefile b/Rakefile
@@ -48,7 +48,7 @@ end
 
 namespace :gem do
   def gem_version
-    require File.join(File.dirname(__FILE__), *%w[lib cocoapods])
+    require File.expand_path('../lib/cocoapods', __FILE__)
     Pod::VERSION
   end
 
@@ -67,7 +67,6 @@ namespace :gem do
   end
 
   def silent_sh(command)
-    #output = `/bin/sh -c '#{command}' 2>&1`
     output = `#{command} 2>&1`
     unless $?.success?
       puts output
@@ -148,7 +147,7 @@ namespace :gem do
 
     # Update the last version in CocoaPods-version.yml
     puts "* Updating last known version in Specs repo"
-    specs_branch = '0.6'
+    specs_branch = 'master'
     Dir.chdir('../Specs') do
       puts Dir.pwd
       sh "git checkout #{specs_branch}"
@@ -159,6 +158,7 @@ namespace :gem do
         $stderr.puts "[!] Unable to find #{yaml_file}!"
         exit 1
       end
+      require 'yaml'
       cocoapods_version = YAML.load_file(yaml_file)
       cocoapods_version['last'] = gem_version
       File.open(yaml_file, "w") do |f|

diff --git a/cocoapods.gemspec b/cocoapods.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json',      '~> 1.7.3'
   s.add_runtime_dependency 'open4',     '~> 1.3.0'
   s.add_runtime_dependency 'rake',      '~> 0.9.0'
-  s.add_runtime_dependency 'xcodeproj', '~> 0.2.0'
+  s.add_runtime_dependency 'xcodeproj', '~> 0.2.1'
 
   s.add_development_dependency 'bacon', '~> 1.1'
 

diff --git a/lib/cocoapods.rb b/lib/cocoapods.rb
@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 
   class PlainInformative < StandardError
   end

diff --git a/lib/cocoapods/command/push.rb b/lib/cocoapods/command/push.rb
@@ -71,6 +71,7 @@ def validate_podspec_files
         lint_argv = ["lint"]
         lint_argv << "--only-errors" if @allow_warnings
         lint_argv << "--silent" if config.silent
+        lint_argv += podspec_files.map(&:to_s)
         all_valid = Spec.new(ARGV.new(lint_argv)).run
       end
 

diff --git a/lib/cocoapods/command/setup.rb b/lib/cocoapods/command/setup.rb
@@ -71,17 +71,16 @@ def set_master_repo_url
       end
 
       def add_master_repo
-        @command ||= Repo.new(ARGV.new(['add', 'master', url, '0.6'])).run
+        @command ||= Repo.new(ARGV.new(['add', 'master', url, 'master'])).run
       end
 
       def update_master_repo
         Repo.new(ARGV.new(['update', 'master'])).run
       end
 
-      #TODO: remove after rc
       def set_master_repo_branch
         Dir.chdir(dir) do
-          git("checkout 0.6")
+          git("checkout master")
         end
       end
 

diff --git a/lib/cocoapods/specification.rb b/lib/cocoapods/specification.rb
@@ -264,16 +264,11 @@ def raw_xconfig
 
     def compiler_flags
       if @parent
-        chained = @compiler_flags[active_platform].clone
-        # TODO hack to get the parent's compiler flags without it being
-        # converted to a String by Specification#compiler_flags.
-        chained.unshift @parent.instance_variable_get(:@compiler_flags)[active_platform]
+        flags = [@parent.compiler_flags]
       else
-        chained = @compiler_flags[active_platform].clone
-        chained.unshift '-fobjc-arc' if @requires_arc
-        chained.unshift ''
+        flags = [requires_arc ? ' -fobjc-arc' : '']
       end
-      chained.join(' ')
+      (flags + @compiler_flags[active_platform].clone).join(' ')
     end
 
     platform_attr_writer :compiler_flags, lambda {|value, current| current << value }

diff --git a/spec/unit/specification_spec.rb b/spec/unit/specification_spec.rb
@@ -321,7 +321,7 @@
 
   it "automatically forwards top level attributes to the top level parent" do
     @spec.activate_platform(:ios)
-    [:version, :license, :authors, :requires_arc].each do |attr|
+    [:version, :license, :authors, :requires_arc, :compiler_flags].each do |attr|
       @spec.subspecs.first.send(attr).should == @spec.send(attr)
       @spec.subspecs.first.subspecs.first.send(attr).should == @spec.send(attr)
     end
@@ -332,8 +332,10 @@
     @spec.source_files.map { |f| f.to_s }.should == %w[ spec.m  ]
     @subspec.source_files.map { |f| f.to_s }.should == %w[ spec.m  subspec_ios.m ]
     @subsubspec.source_files.map { |f| f.to_s }.should == %w[ spec.m  subspec_ios.m subsubspec.m ]
-
     @subsubspec.resources.should == %w[ resource ]
+
+    @subsubspec.compiler_flags = '-Wdeprecated-implementations'
+    @subsubspec.compiler_flags.should == ' -fobjc-arc -Wdeprecated-implementations'
   end
 
   it "returns empty arrays for chained attributes with no value in the chain" do