vendor 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.1.5 (January 27, 2012)
+
+Bug Fixes:
+
+  - Improvements to the Plist converter
+  - Fixes for projects that have Aggregate Targets
+  - Use the correct PList converter on OSX
+
 ## 0.1.4 (January 13, 2012)
 
 Features:

data/Gemfile

@@ -4,5 +4,5 @@ source "http://rubygems.org"
 gemspec
 
 # For testing
-gem 'ruby-debug',   :platforms => :ruby_18
-gem 'ruby-debug19', :platforms => :ruby_19
+# gem 'ruby-debug',   :platforms => :ruby_18
+# gem 'ruby-debug19', :platforms => :ruby_19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vendor (0.1.3)
+    vendor (0.1.5)
       highline
       json
       rake
@@ -13,9 +13,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
     bond (0.4.1)
-    columnize (0.3.4)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
     growl (1.0.3)
@@ -24,14 +22,9 @@ GEM
     guard-rspec (0.5.0)
       guard (>= 0.8.4)
     highline (1.6.2)
-    json (1.6.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
+    json (1.6.5)
     mime-types (1.17.2)
     rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     ripl (0.5.1)
@@ -44,21 +37,6 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
     thor (0.14.6)
 
@@ -71,6 +49,4 @@ DEPENDENCIES
   guard
   guard-rspec
   rspec
-  ruby-debug
-  ruby-debug19
   vendor!

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/vendor/api.rb

@@ -11,7 +11,7 @@ module Vendor
     class Error < StandardError; end
 
     def api_uri
-      ENV["API_URI"] || 'http://vendorforge.org'
+      ENV["API_URI"] || 'http://vendorkit.com'
     end
 
     def api_key(username, password)

data/lib/vendor/cli/app.rb

@@ -35,7 +35,7 @@ module Vendor
           end
         end
 
-        desc "library push VENDOR_FILE", "Push a vendor package to vendorforge.org"
+        desc "library push VENDOR_FILE", "Push a vendor package to vendorkit.com"
         def push(file)
           begin
             Vendor::CLI::Auth.with_api_key do |api_key|
@@ -105,7 +105,7 @@ module Vendor
         Vendor::Template.copy "Vendorfile"
       end
 
-      desc "auth", "Login to your vendorforge.org account"
+      desc "auth", "Login to your vendorkit.com account"
       def auth
         begin
           Vendor::CLI::Auth.with_api_key do |api_key|

data/lib/vendor/cli/auth.rb

@@ -17,7 +17,7 @@ module Vendor
       end
 
       def fetch_api_key
-        Vendor.ui.warn "Please enter your vendorforge.org login and password"
+        Vendor.ui.warn "Please enter your vendorkit.com login and password"
 
         username = ask("Login: ")
         password = ask("Password: ") { |q| q.echo = false }

data/lib/vendor/extensions/string.rb

@@ -4,7 +4,14 @@ class String
     if length == 0
       "\"\""
     else
-      match(/\-|\s|\+|\<|\$|\"|\[|\=|\*|@/) ? self.inspect : self
+      # This is really fucking ugly. So the thing is, I hae no idea what
+      # triggers quotes around string values in an ascii plist. If
+      # anyone knows how, please let me know. I can't just put quotes
+      # around everything, because for some reason, it doesn't work. So
+      # as I find characters that seem to trigger quotes, I drop them in
+      # here. Yes, this isn't a sustainable solution, but it works for
+      # now.
+      match(/\-|\s|\+|\<|\$|\"|\[|\=|\*|@|\,|\./) ? self.inspect : self
     end
   end
 

data/lib/vendor/vendor_file/source.rb

@@ -3,7 +3,7 @@ module Vendor
 
     class Source
 
-      MAPPING = { :vendorforge => "http://vendorforge.com" }
+      MAPPING = { :vendorforge => "http://vendorkit.com", :vendorkit => "http://vendorkit.com" }
 
       attr_accessor :uri
 

data/lib/vendor/xcode/project.rb

@@ -34,7 +34,7 @@ module Vendor::XCode
       # because the custom implementation isn't very reliable. We use it mainly
       # so the gem can run on systems that don't have plutil installed (like our
       # CI server). The plutil app is far more reliable.
-      if RUBY_PLATFORM !=~ /darwin/ || ENV['PARSER'] == 'custom'
+      if RUBY_PLATFORM !~ /darwin/ || ENV['PARSER'] == 'custom'
         contents = File.readlines(@pbxproject).join("\n")
         parsed = Vendor::Plist.parse_ascii(contents)
       else
@@ -47,7 +47,11 @@ module Vendor::XCode
       @objects_by_id = {}
 
       @objects = parsed['objects'].map do |id, attributes|
-        klass = Vendor::XCode::Proxy.const_get(attributes['isa'])
+        begin
+          klass = Vendor::XCode::Proxy.const_get(attributes['isa'])
+        rescue NameError => e
+          klass = Vendor::XCode::Proxy::Unknown
+        end
 
         @objects_by_id[id] = klass.new(:project => self, :id => id, :attributes => attributes)
       end
@@ -163,8 +167,10 @@ module Vendor::XCode
     end
 
     def add_framework(framework, options = {})
-      # Find targets
-      targets = targets_from_options(options)
+      # Find targets and filter out aggregate targets (we can't add files to
+      # those bad boys)
+      targets = targets_from_options(options, :ignore_aggregates => true)
+
       Vendor.ui.debug %{Adding #{framework} to targets "#{targets.map(&:name)}"}
 
       path = if framework.match(/\.dylib/)
@@ -262,8 +268,9 @@ module Vendor::XCode
         raise StandardError.new("Could not find file `#{options[:file]}`") unless File.exists?(options[:file])
       end
 
-      # Find targets
-      targets = targets_from_options(options)
+      # Find targets and filter out aggregate targets (we can't add files to
+      # those bad boys)
+      targets = targets_from_options(options, :ignore_aggregates => true)
 
       # Create the group
       group = create_group(options[:path])
@@ -433,6 +440,7 @@ module Vendor::XCode
       rescue Vendor::Plist::AsciiParser::ParseError => e
         Vendor.ui.error "There was an error converting the XCode project back to a Plist"
         Vendor.ui.error e.inspect
+        Vendor.ui.debug to_ascii_plist
 
         false
       end
@@ -468,8 +476,8 @@ module Vendor::XCode
         keys.each { |k| raise StandardError.new("Missing :#{k} option") unless options[k] }
       end
 
-      def targets_from_options(options)
-        if options[:targets]
+      def targets_from_options(options, opts = {})
+        targets = if options[:targets]
           [ *options[:targets] ].map do |t|
             if t == :all
               root_object.targets
@@ -482,6 +490,12 @@ module Vendor::XCode
         else
           root_object.targets
         end
+
+        if opts[:ignore_aggregates]
+          targets.reject { |t| t.kind_of? Vendor::XCode::Proxy::PBXAggregateTarget }
+        else
+          targets
+        end
       end
 
   end

data/lib/vendor/xcode/proxy.rb

@@ -5,6 +5,7 @@ module Vendor
     module Proxy
 
       autoload :Base,                      "vendor/xcode/proxy/base"
+      autoload :PBXAggregateTarget,        "vendor/xcode/proxy/pbx_aggregate_target"
       autoload :PBXProject,                "vendor/xcode/proxy/pbx_project"
       autoload :PBXFileReference,          "vendor/xcode/proxy/pbx_file_reference"
       autoload :PBXGroup,                  "vendor/xcode/proxy/pbx_group"
@@ -21,6 +22,7 @@ module Vendor
       autoload :XCBuildConfiguration,      "vendor/xcode/proxy/xc_build_configuration"
       autoload :XCConfigurationList,       "vendor/xcode/proxy/xc_configuration_list"
       autoload :XCVersionGroup,            "vendor/xcode/proxy/xc_version_group"
+      autoload :Unknown,                   "vendor/xcode/proxy/unknown"
 
     end
 

data/lib/vendor/xcode/proxy/pbx_aggregate_target.rb

@@ -0,0 +1,11 @@
+module Vendor::XCode::Proxy
+
+  class PBXAggregateTarget < Vendor::XCode::Proxy::Base
+
+    reference :build_phases
+    reference :dependencies
+    reference :build_configuration_list
+
+  end
+
+end

data/lib/vendor/xcode/proxy/unknown.rb

@@ -0,0 +1,8 @@
+module Vendor::XCode::Proxy
+
+  # This is a wrapper for any object that I haven't already covered
+  class Unknown < Vendor::XCode::Proxy::Base
+
+  end
+
+end

data/spec/lib/vendor/vendor_file/loader_spec.rb

@@ -22,7 +22,7 @@ describe Vendor::VendorFile::Loader do
     end
 
     it "should load all the sources" do
-      @sources.map(&:uri).should == [ "http://vendorforge.com", "http://vendorage.com" ]
+      @sources.map(&:uri).should == [ "http://vendorkit.com", "http://vendorage.com" ]
     end
 
     it "should load all the libraries" do

data/spec/lib/vendor/vendor_file/source_spec.rb

@@ -11,7 +11,7 @@ describe Vendor::VendorFile::Source do
   it "should allow you to set a uri via a symbol" do
     source = Vendor::VendorFile::Source.new(:vendorforge)
 
-    source.uri.should == "http://vendorforge.com"
+    source.uri.should == "http://vendorkit.com"
   end
 
 end

data/spec/lib/vendor/xcode/project_spec.rb

@@ -11,7 +11,7 @@ describe Vendor::XCode::Project do
     context "ProjectWithSpecs.xcodeproj" do
 
       it "should load all the objects" do
-        @project.objects.length.should == 48
+        @project.objects.length.should == 52
       end
 
       it "should load the object version" do
@@ -52,6 +52,23 @@ describe Vendor::XCode::Project do
 
     end
 
+    context "other projects in the ProjectsToTestParsing folder" do
+
+      projects = Dir[File.join(PROJECT_RESOURCE_PATH, "ProjectsToTestParsing/*.xcodeproj")]
+
+      projects.each do |p|
+        it "should correctly load and save '#{p}'" do
+          project = Vendor::XCode::Project.new(p)
+          contents = File.readlines(File.join(p, "project.pbxproj")).join("\n")
+          original = Vendor::Plist.parse_ascii(contents)
+          saved = Vendor::Plist.parse_ascii(project.to_ascii_plist)
+
+          original.should == saved
+        end
+      end
+
+    end
+
   end
 
   context "#name" do
@@ -244,7 +261,7 @@ describe Vendor::XCode::Project do
                                                      :path => "Frameworks", :name => "KeithPitt.framework",
                                                      :source_tree => :sdkroot })
 
-      @temp_project.add_framework "KeithPitt.framework", :targets => "Integration"
+      @temp_project.add_framework "KeithPitt.framework", :targets => [ "Integration", "AggregateTarget" ]
     end
 
     it "should add the dylibs to the right targets" do
@@ -563,7 +580,7 @@ describe Vendor::XCode::Project do
     end
 
     it "should raise an error if there is an invalid format" do
-      @project.should_receive(:to_ascii_plist).and_return { "asd; { f5him" }
+      @project.should_receive(:to_ascii_plist).twice.and_return { "asd; { f5him" }
 
       @project.valid?.should be_false
     end

data/spec/lib/vendor/xcode/proxy/pbx_project_spec.rb

@@ -20,7 +20,10 @@ describe Vendor::XCode::Proxy::PBXProject do
   end
 
   it "should reference the targets" do
-    @pbx_project.targets.should == [ @project.find_object("5378749E14010A0A00D9B746") ]
+    @pbx_project.targets.should == [
+      @project.find_object("5378749E14010A0A00D9B746"),
+      @project.find_object("53BD73C714D0AF9A00E30313")
+    ]
   end
 
 end

data/spec/support/api_stubs.rb

@@ -24,47 +24,47 @@ VENDOR_JSON[:LibWithError] = { :name => "LibWithError",
                                :versions => [ [ "0.1", { :dependencies => [ ] } ] ]
                             }
 
-FakeWeb.register_uri :get, "http://keithpitt:password@vendorforge.org/users/keithpitt/api_key.json",
+FakeWeb.register_uri :get, "http://keithpitt:password@vendorkit.com/users/keithpitt/api_key.json",
                      :body => { :api_key => "secret" }.to_json
 
-FakeWeb.register_uri :get, "http://keithpitt:wrong@vendorforge.org/users/keithpitt/api_key.json",
+FakeWeb.register_uri :get, "http://keithpitt:wrong@vendorkit.com/users/keithpitt/api_key.json",
                      :status => 401
 
-FakeWeb.register_uri :get, "http://keithpitt:error@vendorforge.org/users/keithpitt/api_key.json",
+FakeWeb.register_uri :get, "http://keithpitt:error@vendorkit.com/users/keithpitt/api_key.json",
                      :status => 500
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/DKBenchmark.json",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/DKBenchmark.json",
                      :body => VENDOR_JSON[:DKBenchmark].to_json
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/DKBenchmark-With-Some-Crazy-Number-Name-.json",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/DKBenchmark-With-Some-Crazy-Number-Name-.json",
                      :body => VENDOR_JSON[:DKBenchmarkCrazyName].to_json
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/WithAnError.json",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/WithAnError.json",
                      :status => 500
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/DoesNotExist.json",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/DoesNotExist.json",
                      :status => 404
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/DKBenchmark/versions/0.1/download",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/DKBenchmark/versions/0.1/download",
                      :body => File.read(File.join(PACKAGED_VENDOR_PATH, "DKBenchmark-0.1.vendor"))
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/DKBenchmark/versions/0.2/download",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/DKBenchmark/versions/0.2/download",
                      :body => File.read(File.join(PACKAGED_VENDOR_PATH, "DKBenchmark-0.1.vendor"))
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/LibWithError.json",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/LibWithError.json",
                      :body => VENDOR_JSON[:LibWithError].to_json
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/LibWithError/versions/0.1/download",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/LibWithError/versions/0.1/download",
                      :status => 500
 
 ###
 # DEPENDENCY CALLS
 ###
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/DKRest.json",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/DKRest.json",
                      :body => %{{"name":"DKRest","description":"Classes that make it easy to work with REST Services","release":"0.1","versions":[["0.1",{"dependencies":[["DKAPIRequest","0.1"],["DKCoreData","0.1"],["DKFile","0.1"],["DKPredicateBuilder","0.1"],["DKSupport","0.1"]]}]]}}
 
-FakeWeb.register_uri :get, "http://vendorforge.org/vendors/DKCoreData.json",
+FakeWeb.register_uri :get, "http://vendorkit.com/vendors/DKCoreData.json",
                      :body => %{{"name":"DKCoreData","description":"A set of classes that make it easy to work with the Core Data framework on iOS and OSX","release":"0.1","versions":[["1.5.2",{"dependencies":[["DKFile","0.1"],["DKPredicateBuilder","0.1"],["DKSupport","0.1"]]}]]}}
 
 FakeWeb.allow_net_connect = false

data/spec/support/resources/projects/MultipleTargets/MultipleTargets.xcodeproj/project.pbxproj

@@ -6,6 +6,19 @@
 	objectVersion = 46;
 	objects = {
 
+/* Begin PBXAggregateTarget section */
+		53A7DCC114D0B3AE00A4FE42 /* AggregateTarget */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 53A7DCC414D0B3AE00A4FE42 /* Build configuration list for PBXAggregateTarget "AggregateTarget" */;
+			buildPhases = (
+			);
+			dependencies = (
+			);
+			name = AggregateTarget;
+			productName = AggregateTarget;
+		};
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
 		53F42B5E14667527006B8F7C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F42B5D14667527006B8F7C /* UIKit.framework */; };
 		53F42B6014667527006B8F7C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F42B5F14667527006B8F7C /* Foundation.framework */; };
@@ -285,6 +298,7 @@
 				53F42B8014667530006B8F7C /* MultipleTargets-iPad */,
 				53F42B9B14667536006B8F7C /* Specs */,
 				53F42BAF1466753B006B8F7C /* Integration */,
+				53A7DCC114D0B3AE00A4FE42 /* AggregateTarget */,
 			);
 		};
 /* End PBXProject section */
@@ -423,6 +437,20 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
+		53A7DCC214D0B3AE00A4FE42 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		53A7DCC314D0B3AE00A4FE42 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 		53F42B7B14667527006B8F7C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -573,6 +601,14 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		53A7DCC414D0B3AE00A4FE42 /* Build configuration list for PBXAggregateTarget "AggregateTarget" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				53A7DCC214D0B3AE00A4FE42 /* Debug */,
+				53A7DCC314D0B3AE00A4FE42 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 		53F42B5314667526006B8F7C /* Build configuration list for PBXProject "MultipleTargets" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (