vendor 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vendor (0.0.1)
+    vendor (0.0.2)
       json
       rake
       rest-client

data/Readme.markdown

@@ -125,16 +125,17 @@ running:
 $ vendor library publish my_library.vendor
 ```
 
-## Why not CocoaPods?
+## What about CocoaPods?
 
 During the early days of Vendor development, another dependency/package
 manager called [CocoaPods](https://github.com/alloy/cocoapods) came on the seen. I had a look into the
-project, but _I_ like my all the source files in my project to be in
-one place. I didn't like the idea of compiling all my dependencies into
-a static lib. I also don't like the approach of _requiring_ all libs to
-be commited to the main CocoaPods repo (just like [homebrew](https://github.com/mxcl/homebrew)).
+project, but there were a few things that I didn't quite like.
+I prefer all the source files for my dependencies to be stored in the project itself - not hidden in a static
+library. I tend to tweak and read through those libraries, so having
+the source readily available is handy. I also don't like the approach of requiring all the libraries to
+be commited to a centralized git repo (similar to [homebrew](https://github.com/mxcl/homebrew)).
 I think it puts alot of pressure on the maintainer to make sure that he reviews all the libs and that they're
-not doing anything smelly.
+not doing anything smelly. It also fattens the git repo :D
 
 In saying that, trying to solve the problem of iOS dependency
 management, is tough, and a big shout out to anyone that tries to solve
@@ -148,7 +149,7 @@ strengths of Vendor.
 
 I also like the idea of a central site where people can upload their own
 libraries - just like Rubygems. There isn't much of an ecosystem
-around iOS development, just lots of isolated Github repos. I hope
+around open source iOS/OSX development, just lots of isolated Github repos and blog posts. I hope
 Vendor can fix this.
 
 ## History

data/lib/vendor/vendor_file/library/base.rb

@@ -11,7 +11,7 @@ module Vendor
         attr_accessor :require
 
         def initialize(attributes = {})
-          @source_tree = :relative
+          @source_tree = :group
           attributes.each { |k, v| self.send("#{k}=", v) }
         end
 

data/lib/vendor/version.rb

@@ -1,5 +1,5 @@
 module Vendor
 
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 
 end

data/lib/vendor/xcode/project.rb

@@ -81,6 +81,9 @@ module Vendor::XCode
                                                           :id => Vendor::XCode::Proxy::Base.generate_id,
                                                   :attributes => { 'path' => name, 'sourceTree' => '<group>', 'children' => [] })
 
+          # Set the parent
+          group.parent = current
+
           @objects_by_id[group.id] = group
 
           # This is hacky
@@ -183,6 +186,9 @@ module Vendor::XCode
                                                              :id => Vendor::XCode::Proxy::Base.generate_id,
                                                      :attributes => attributes)
 
+      # Set the parent
+      file.parent = group
+
       # Add the file id to the groups children
       group.attributes['children'] << file.id
 

data/spec/lib/vendor/vendor_file/library/base_spec.rb

@@ -7,6 +7,10 @@ describe Vendor::VendorFile::Library::Base do
   let(:temp_path) { TempProject.create(File.join(PROJECT_RESOURCE_PATH, "UtilityApplication")) }
   let(:project) { Vendor::XCode::Project.new(File.join(temp_path, "UtilityApplication.xcodeproj")) }
 
+  let(:lib_with_no_manifest_or_vendorspec) { Vendor::VendorFile::Library::Base.new(:name => "BingMapsIOS", :require => "MapControl") }
+  let(:lib_with_manifest) { Vendor::VendorFile::Library::Base.new(:name => "DKBenchmark-Manifest") }
+  let(:lib_with_vendorspec) { Vendor::VendorFile::Library::Base.new(:name => "DKBenchmark-Vendorspec") }
+
   it "should have a name attribute" do
     lib.name = "lib"
 
@@ -21,17 +25,42 @@ describe Vendor::VendorFile::Library::Base do
 
   describe "#install" do
 
+    before :each do
+      Vendor.stub(:library_path).and_return CACHED_VENDOR_RESOURCE_PATH
+
+      lib_with_manifest.install project
+    end
+
     context "with an existing installation" do
 
-      it "should remove the existing group from XCode"
+      before :each do
+        # Install it again
+        lib_with_manifest.install project
+      end
+
+      it "should add the group to the project" do
+        group = project.find_group("Vendor/DKBenchmark-Manifest")
+        group.should_not be_nil
+      end
 
-      it "should add the new files to the project"
+      it "should add the files to the project" do
+        children = project.find_group("Vendor/DKBenchmark-Manifest").children
+        children.length.should == 2
+      end
 
     end
 
     context "with a fresh installation" do
 
-      it "should add the new files to the project"
+      it "should add the group to the project" do
+        group = project.find_group("Vendor/DKBenchmark-Manifest")
+        group.should_not be_nil
+      end
+
+      it "should add the files to the project" do
+        children = project.find_group("Vendor/DKBenchmark-Manifest").children
+        children.length.should == 2
+      end
 
     end
 
@@ -47,17 +76,13 @@ describe Vendor::VendorFile::Library::Base do
 
   describe "#files" do
 
-    let(:no_manifest_or_vendorspec) { Vendor::VendorFile::Library::Base.new(:name => "BingMapsIOS", :require => "MapControl") }
-    let(:with_manifest) { Vendor::VendorFile::Library::Base.new(:name => "DKBenchmark-Manifest") }
-    let(:with_vendorspec) { Vendor::VendorFile::Library::Base.new(:name => "DKBenchmark-Vendorspec") }
-
     before :each do
       Vendor.stub(:library_path).and_return CACHED_VENDOR_RESOURCE_PATH
     end
 
     context "with no manifest or vendorspec" do
 
-      let(:files) { no_manifest_or_vendorspec.files }
+      let(:files) { lib_with_no_manifest_or_vendorspec.files }
       let(:names) { files.map { |file| File.basename(file) } }
 
       it "should return the correct files" do
@@ -89,7 +114,7 @@ describe Vendor::VendorFile::Library::Base do
 
     context "with a vendorspec" do
 
-      let(:files) { with_vendorspec.files }
+      let(:files) { lib_with_vendorspec.files }
       let(:names) { files.map { |file| File.basename(file) } }
 
       it "should return the correct files" do
@@ -117,7 +142,7 @@ describe Vendor::VendorFile::Library::Base do
 
     context "with a manifest" do
 
-      let(:files) { with_manifest.files }
+      let(:files) { lib_with_manifest.files }
       let(:names) { files.map { |file| File.basename(file) } }
 
       it "should return the correct files" do

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

@@ -139,6 +139,10 @@ describe Vendor::XCode::Project do
         @here_group.isa.should == 'PBXGroup'
       end
 
+      it "should set the parent" do
+        @here_group.parent.should == @inside_group
+      end
+
     end
 
   end
@@ -268,6 +272,10 @@ describe Vendor::XCode::Project do
         group.children[1].should == @second_file_added
       end
 
+      it "should set the parent" do
+        @first_file_added.parent.should == @temp_project.find_group("Controllers/SecondViewController")
+      end
+
       it 'should still save' do
         @temp_project.save
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151953911140 !ruby/object:Gem::Requirement
+  requirement: &70306350501080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151953911140
+  version_requirements: *70306350501080
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70151953910260 !ruby/object:Gem::Requirement
+  requirement: &70306350500220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151953910260
+  version_requirements: *70306350500220
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &70151953908840 !ruby/object:Gem::Requirement
+  requirement: &70306350498880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151953908840
+  version_requirements: *70306350498880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70151953906920 !ruby/object:Gem::Requirement
+  requirement: &70306350496500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151953906920
+  version_requirements: *70306350496500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70151953906000 !ruby/object:Gem::Requirement
+  requirement: &70306350495200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151953906000
+  version_requirements: *70306350495200
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70151953905220 !ruby/object:Gem::Requirement
+  requirement: &70306350494060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151953905220
+  version_requirements: *70306350494060
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70151953903980 !ruby/object:Gem::Requirement
+  requirement: &70306350491180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151953903980
+  version_requirements: *70306350491180
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70151953903100 !ruby/object:Gem::Requirement
+  requirement: &70306350490260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151953903100
+  version_requirements: *70306350490260
 description: Vendor manages an application's dependencies
 email:
 - me@keithpitt.com