vendor 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 0.1.4 (January 13, 2012)
+
+Features:
+
+  - Updated default Vendorfile
+  - Added support for files with .c extensions (@rauluranga)
+
+Bug Fixes:
+
+  - Don't allow libraries with no vendor files
+  - Renamed vendorforge.org to vendorkit.com in various places
+
+## 0.1.2 (November 8, 2011)
+
+Bug Fixes:
+
+  - When adding dylibs and framworks ensure they have the correct name
+
+## 0.1.2 (November 8, 2011)
+
+Features:
+
+  - Added support for adding dylibs to the frameworks build phase
+
 ## 0.1.1 (November 8, 2011)
 
 Bug Fixes:

data/Readme.markdown

@@ -31,11 +31,11 @@ Specify your dependencies in a Vendors file in your project's root.
 
 ```ruby
 # Downloads the latest version of DKBenchmark from
-# http://vendorforge.com
+# http://vendorkit.com
 lib "DKBenchmark"
 
 # Downloads version 0.5 of DKPredicateBuilder from
-# http://vendorforge.com
+# http://vendorkit.com
 lib "DKPredicateBuilder", '0.5'
 
 # Include all the source files found in ~/Development/DKRest/Classes
@@ -45,7 +45,7 @@ lib "DKRest", :path => "~/Development/DKRest", :require => "Classes"
 # Checks out the git repo and includes all the files found in the
 # AFNetworking folder in the repo. The require option is handy for
 # repo's that haven't created vendor libraries and pushed them to
-# Vendorforge
+# VendorKit.com
 lib "DKRest", :git => "git://github.com/gowalla/AFNetworking.git", :require => "AFNetworking"
 
 # The Vendorfile allows you to specify targets to add your libraries to.
@@ -137,40 +137,13 @@ vendor library by running:
 $ vendor library build my_library.vendorspec
 ```
 
-Now that you have a packaged library, you can push it to [http://vendorforge.org](http://vendorforge.org) by
+Now that you have a packaged library, you can push it to [http://vendorkit.com](http://vendorkit.com) by
 running:
 
 ```bash
 $ vendor library push my_library.vendor
 ```
 
-## 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 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. 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
-the problem. I should also mention another library that I admire that is
-also trying to solve this problem: [Kit](https://github.com/nkpart/kit)
-
-I wrote Vendor the way I think dependency management should be handled,
-and in a way that I like. Vendor can work with any lib, even if it
-doesn't have a compiled vendorspec - which I think is one of the
-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 open source iOS/OSX development, just lots of isolated Github repos and blog posts. I hope
-Vendor can fix this.
-
 ## History
 
 Vendor was inspired by a blog post entitled [Vendor – Bringing Bundler to iOS](http://engineering.gomiso.com/2011/08/08/vendor-the-best-way-to-manage-ios-libraries/). I had started working on Vendor after they started doing it themselves. Their repo can be found here [https://github.com/bazaarlabs/vendor](https://github.com/bazaarlabs/vendor). I took many of the ideas (and parts of this Readme) from their code.

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/vendor/templates/Vendorfile

@@ -1,5 +1,6 @@
 # This is an example Vendorfile for you to start editing and add your
-# own dependencies. Check out http://github.com/keithpitt/vendor for
+# own dependencies. Check out http://vendorkit.com/documentation for
 # more information on how to use this file.
 
-lib "DKBenchmark", "0.2"
+# lib "ASIHTTPRequest", "~> 1.8"
+# lib "JSONKit", "~> 1.4"

data/lib/vendor/vendor_spec/builder.rb

@@ -3,6 +3,8 @@ module Vendor
 
     class Builder
 
+      class NoFilesError < StandardError; end
+
       require 'fileutils'
       require 'tmpdir'
       require 'find'
@@ -44,10 +46,14 @@ module Vendor
         def copy_files(data_dir)
           data_files = []
 
+          raise NoFilesError.new("No file definition found for #{@name}") if @vendor_spec.files.nil?
+
           # Remove files that are within folders with a ".", such as ".bundle"
           # and ".frameworks"
           copy_files = @vendor_spec.files.reject { |file| file =~ /\/?[^\/]+\.[^\/]+\// }
 
+          raise NoFilesError.new("No files found for packaging") if copy_files.empty?
+
           copy_files.each do |file|
             dir = File.dirname(file)
             path = File.join(@folder, file)

data/lib/vendor/xcode/project.rb

@@ -443,7 +443,7 @@ module Vendor::XCode
       def build_phase_for_file(file_type, target)
         # Which build phase does this file belong?
         klass = case file_type
-          when "sourcecode.c.objc"
+          when "sourcecode.c.objc", "sourcecode.c.c"
             Vendor::XCode::Proxy::PBXSourcesBuildPhase
           when "wrapper.framework"
             Vendor::XCode::Proxy::PBXFrameworksBuildPhase

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

@@ -25,6 +25,7 @@ module Vendor::XCode::Proxy
         when /.(png|jpg)/ then "image.#{$1}"
         when ".h"         then "sourcecode.c.h"
         when ".m"         then "sourcecode.c.objc"
+        when ".c"         then "sourcecode.c.c"
         when ".bundle"    then "wrapper.plug-in"
         when ".framework" then "wrapper.framework"
         when ".a"         then "archive.ar"

data/spec/lib/vendor/vendor_spec/builder_spec.rb

@@ -52,33 +52,49 @@ describe Vendor::VendorSpec::Builder do
 
   context "#build" do
 
-    let (:builder) { Vendor::VendorSpec::Builder.new(File.join(VENDOR_RESOURCE_PATH, "DKBenchmark", "DKBenchmark.vendorspec")) }
+    context "with a valid vendor spec" do
 
-    before :all do
-      builder.build
-    end
+      let (:builder) { Vendor::VendorSpec::Builder.new(File.join(VENDOR_RESOURCE_PATH, "DKBenchmark", "DKBenchmark.vendorspec")) }
 
-    it "should create the .vendor file" do
-      File.exist?(builder.filename).should be_true
-    end
+      before :all do
+        builder.build
+      end
 
-    it "should be a zip file" do
-      mimetype = `file #{builder.filename} --mime-type`.chomp
+      it "should create the .vendor file" do
+        File.exist?(builder.filename).should be_true
+      end
 
-      mimetype.should =~ /application\/zip/
-    end
+      it "should be a zip file" do
+        mimetype = `file #{builder.filename} --mime-type`.chomp
 
-    it "should contain a vendor.json file" do
-      Zip::ZipFile.open(builder.filename) do |zipfile|
-        zipfile.file.read("vendor.json").should == builder.vendor_spec.to_json
+        mimetype.should =~ /application\/zip/
       end
+
+      it "should contain a vendor.json file" do
+        Zip::ZipFile.open(builder.filename) do |zipfile|
+          zipfile.file.read("vendor.json").should == builder.vendor_spec.to_json
+        end
+      end
+
+      it "should contain the files contained in the vendor spec" do
+        Zip::ZipFile.open(builder.filename) do |zipfile|
+          zipfile.file.read("data/DKBenchmark.h") =~ /DKBenchmark\.h/
+          zipfile.file.read("data/DKBenchmark.m") =~ /DKBenchmark\.m/
+        end
+      end
+
     end
 
-    it "should contain the files contained in the vendor spec" do
-      Zip::ZipFile.open(builder.filename) do |zipfile|
-        zipfile.file.read("data/DKBenchmark.h") =~ /DKBenchmark\.h/
-        zipfile.file.read("data/DKBenchmark.m") =~ /DKBenchmark\.m/
+    context "with no files" do
+
+      let (:builder) { Vendor::VendorSpec::Builder.new(File.join(VENDOR_RESOURCE_PATH, "EmptyVendor", "EmptyVendor.vendorspec")) }
+
+      it "should not allow you to build" do
+        expect do
+          builder.build
+        end.should raise_error(Vendor::VendorSpec::Builder::NoFilesError, "No files found for packaging")
       end
+
     end
 
   end

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

@@ -6,6 +6,7 @@ describe Vendor::XCode::Proxy::PBXFileReference do
 
     { ".h"         => "sourcecode.c.h",
       ".m"         => "sourcecode.c.objc",
+      ".c"         => "sourcecode.c.c",
       ".bundle"    => "wrapper.plug-in",
       ".framework" => "wrapper.framework",
       ".a"         => "archive.ar",

data/spec/support/resources/vendors/EmptyVendor/EmptyVendor.vendorspec

@@ -0,0 +1,12 @@
+Vendor::Spec.new do |s|
+
+  s.name           "EmptyVendor"
+  s.version        "0.1"
+
+  s.authors        "keithpitt"
+  s.email          "me@keithpitt.com"
+  s.description    "Blah"
+  
+  s.files          [ ]
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendor
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2012-01-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70207634134280 !ruby/object:Gem::Requirement
+  requirement: &70321378681860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207634134280
+  version_requirements: *70321378681860
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70207634133580 !ruby/object:Gem::Requirement
+  requirement: &70321378672060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207634133580
+  version_requirements: *70321378672060
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70207634132860 !ruby/object:Gem::Requirement
+  requirement: &70321378671240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207634132860
+  version_requirements: *70321378671240
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70207634132220 !ruby/object:Gem::Requirement
+  requirement: &70321378670780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207634132220
+  version_requirements: *70321378670780
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70207634131640 !ruby/object:Gem::Requirement
+  requirement: &70321378670060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207634131640
+  version_requirements: *70321378670060
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &70207634131160 !ruby/object:Gem::Requirement
+  requirement: &70321378669140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207634131160
+  version_requirements: *70321378669140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70207634130680 !ruby/object:Gem::Requirement
+  requirement: &70321378667000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207634130680
+  version_requirements: *70321378667000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70207634130080 !ruby/object:Gem::Requirement
+  requirement: &70321378665360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207634130080
+  version_requirements: *70321378665360
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70207634129500 !ruby/object:Gem::Requirement
+  requirement: &70321378664500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207634129500
+  version_requirements: *70321378664500
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70207634128920 !ruby/object:Gem::Requirement
+  requirement: &70321378663160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207634128920
+  version_requirements: *70321378663160
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70207634128320 !ruby/object:Gem::Requirement
+  requirement: &70321378661440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207634128320
+  version_requirements: *70321378661440
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70207634127900 !ruby/object:Gem::Requirement
+  requirement: &70321378660300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207634127900
+  version_requirements: *70321378660300
 description: Vendor manages an application's dependencies
 email:
 - me@keithpitt.com
@@ -331,6 +331,7 @@ files:
 - spec/support/resources/vendors/DKBenchmarkUnsafe/DKBenchmark.h
 - spec/support/resources/vendors/DKBenchmarkUnsafe/DKBenchmark.m
 - spec/support/resources/vendors/DKBenchmarkUnsafe/DKBenchmark.vendorspec
+- spec/support/resources/vendors/EmptyVendor/EmptyVendor.vendorspec
 - spec/support/temp_project.rb
 - vendor.gemspec
 homepage: http://www.vendorforge.org
@@ -476,4 +477,5 @@ test_files:
 - spec/support/resources/vendors/DKBenchmarkUnsafe/DKBenchmark.h
 - spec/support/resources/vendors/DKBenchmarkUnsafe/DKBenchmark.m
 - spec/support/resources/vendors/DKBenchmarkUnsafe/DKBenchmark.vendorspec
+- spec/support/resources/vendors/EmptyVendor/EmptyVendor.vendorspec
 - spec/support/temp_project.rb