vendor 0.0.1 → 0.0.2

data/.gitignore

@@ -10,3 +10,4 @@ contents.xcworkspacedata
 tmp
 log
 *.vendor
+DerivedData

data/Gemfile.lock

@@ -2,7 +2,6 @@ PATH
   remote: .
   specs:
     vendor (0.0.1)
-      colorize
       json
       rake
       rest-client
@@ -15,11 +14,10 @@ GEM
   specs:
     archive-tar-minitar (0.5.2)
     bond (0.4.1)
-    colorize (0.5.8)
     columnize (0.3.4)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
-    json (1.5.4)
+    json (1.6.1)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
@@ -27,7 +25,7 @@ GEM
     mime-types (1.16)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
-    rest-client (1.6.3)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     ripl (0.5.1)
       bond (~> 0.4.0)

data/LICENSE

@@ -0,0 +1,20 @@
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Readme.markdown

@@ -1,5 +1,7 @@
 # Vendor – an iOS library management system
 
+[![Build Status](https://secure.travis-ci.org/keithpitt/vendor.png)](http://travis-ci.org/keithpitt/vendor)
+
 Vendor makes the process of using and managing libraries in iOS easy. Vendor is modeled after [Bundler](https://github.com/carlhuda/bundler). Vendor streamlines the installation and update process for dependent libraries.  It also tracks versions and manages dependencies between libraries.
 
 ## Installation
@@ -23,11 +25,37 @@ $ sudo gem install vendor
 Specify your dependencies in a Vendors file in your project's root.
 
 ```ruby
-source "https://vendorage.com"
+source "https://vendorforge.com"
 
+# Downloads the latest version of DKBenchmark from
+# http://vendorforge.com
 lib "DKBenchmark"
-lib "DKPredicateBuilder"
-lib "JSONKit", :git => "https://github.com/johnezang/JSONKit.git"
+
+# Downloads version 0.5 of DKPredicateBuilder from
+# http://vendorforge.com
+lib "DKPredicateBuilder", '0.5'
+
+# Include all the source files found in ~/Development/DKRest/Classes
+# This is usefull when developing your own libraries
+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
+lib "DKRest", :git => "git://github.com/gowalla/AFNetworking.git", :require => "AFNetworking"
+
+# The Vendorfile allows you to specify targets to add your libraries to.
+# By default, each library will be added to all targets, but if you have
+# library that you only wanted to use in the "Integration Tests" target,
+# you could do the following
+target "Integration Tests" do
+  lib "cedar", '0.2'
+end
+
+# These lines are an alternative syntax to the target specification above
+lib "OCMock", :targets => [ "Integration Tests", "Specs" ]
+lib "Kiwi", :target => "Specs"
 ```
 
 You can do this by either creating a `Vendorfile` manually, or by running:
@@ -43,7 +71,7 @@ $ vendor install
 $ git add Vendors.lock
 ```
 
-Installing a vendor library gets the latest version of the code, and adds them directly to your project in a "Vendor" group.
+Installing a vendor library gets the latest version of the code, and adds them directly to your project in a `Vendor` group.
 
 As part of the installation process the required frameworks are added aswell as any compiler/linker flags. The installed version of the library is captured in the Vendors.lock file.
 
@@ -53,11 +81,21 @@ XCode sometimes goes bonkers if you try and make a modification to it while its
 
 ## Creating Libraries
 
+If a vendor library has no framework dependencies, has no required additional compiler/linker flags, and has an XCode project, it doesn’t require a "vendorspec". An example is JSONKit, which may be specified as below. However, if another Vendor library requires JSONKit, JSONKit must have a vendorspec.
+
+```ruby
+lib "JSONKit", :git => "https://github.com/johnezang/JSONKit.git"
+```
+
+However, if the vendor library requires frameworks or has dependencies on other Vendor libraries, it must have a vendorspec. As with Rubygems, a vendorspec is some declarative Ruby code that is open source and centrally managed.
+
+To create a vendorspec, simply run:
+
 ```bash
-$ vendor library create
+$ vendor library init
 ```
 
-Will create a `.vendorspec` file that looks something like this:
+This command will create a blank `.vendorspec` file that looks something like this:
 
 ```ruby
 name          "DKBenchmark"
@@ -73,13 +111,46 @@ github        "https://github.com/keithpitt/DKBenchmark"
 files         [ "DKBenchmark.h", "DKBenchmark.m" ]
 ```
 
-Change what you need to match your project, and to push the library to
-[http://vendorage.com](http://vendorage.com), just run the following:
+Change what you need to match your project, then build a packaged
+vendor library by running:
+
+```bash
+$ 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
+running:
 
 ```bash
-$ vendor library publish
+$ vendor library publish my_library.vendor
 ```
 
+## Why not 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)).
+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.
+
+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 iOS development, just lots of isolated Github repos. 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.
@@ -96,6 +167,16 @@ So I've probably made mistake or two. But thats OK, because at least I have *som
 * [Tim Lee](http://twitter.com/#!/timothy1ee)
 * [Jari Bakken](https://github.com/jarib/plist/blob/master/lib/plist/ascii.rb)
 
+## Special Thanks
+
+Thanks to the following libraries. They provided me with a great deal of
+inspiration and example code :D
+
+* [CocoaPods](https://github.com/alloy/cocoapods)
+* [Kit](https://github.com/nkpart/kit)
+* [Vendor](https://github.com/bazaarlabs/vendor)
+* [Bundler](https://github.com/carlhuda/bundler)
+
 ## Note on Patches/Pull Requests
 
 1. Fork the project.
@@ -106,4 +187,4 @@ So I've probably made mistake or two. But thats OK, because at least I have *som
 
 ## Copyright
 
-Copyright (c) 2011 Keith Pitt. See LICENSE for details.
+Copyright © 2011 Keith Pitt. See LICENSE for details.

data/bin/vendor

@@ -2,61 +2,13 @@
 require "rubygems"
 
 require "thor"
+require "thor/group"
 require "ripl"
 
-$:.push File.expand_path(File.join(__FILE__, "..", "..", "lib"))
+# During development, I symlink /usr/local/bin/vendor to this file
+this_file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+$:.push File.expand_path(File.join(this_file, "..", "..", "lib"))
 
 require "vendor"
-require "vendor/cli"
 
-class Vendor::App < Thor
-
-  desc "auth", "Login to your vendorage.com account"
-  def auth
-    begin
-      Vendor::CLI::Auth.with_api_key do |api_key|
-        puts "Successfully authenticated".green
-      end
-    rescue Vendor::API::Error => e
-      puts "Error: #{e.message}".red
-    end
-  end
-
-  desc "build MANIFEST_FILE", "Build a vendor package from a vendorspec file"
-  def build(file)
-    builder = Vendor::Manifest::Builder.new(File.expand_path(file))
-    if builder.build
-      puts "Successfully built Vendor".green
-      puts "Name: #{builder.name}"
-      puts "Version: #{builder.version}"
-      puts "File: #{builder.filename}"
-    end
-  end
-
-  desc "publish VENDOR_FILE", "Publish a vendor package to vendorage.com"
-  def publish(file)
-    begin
-      Vendor::CLI::Auth.with_api_key do |api_key|
-        url = Vendor::API.publish :file => File.expand_path(file), :api_key => api_key
-        puts "Successfully published to #{url}".green
-      end
-    rescue Vendor::API::Error => e
-      puts "Error: #{e.message}".red
-    end
-  end
-
-  desc "console", "Load an interactive shell with the Vendor classes loaded"
-  def console
-    # Need to clear the arguments otherwise they are passed through to RIPL
-    ARGV.clear
-    Ripl.start :binding => Vendor::CLI.instance_eval{ binding }
-  end
-
-  # Exit with 1 if thor encounters an error (such as command missing)
-  def self.exit_on_failure?
-    true
-  end
-
-end
-
-Vendor::App.start
+Vendor::CLI::App.start

data/lib/vendor.rb

@@ -1,33 +1,44 @@
-$:.push File.expand_path("../", __FILE__)
-
 require "vendor/version"
-require "vendor/plist"
-require "vendor/config"
-require "vendor/api"
-
-require "vendor/vendor_spec/builder"
-require "vendor/vendor_spec/dsl"
-require "vendor/vendor_spec/loader"
 
 require "vendor/extensions/array"
 require "vendor/extensions/hash"
 require "vendor/extensions/fixnum"
 require "vendor/extensions/string"
 
-require "vendor/xcode/object"
-require "vendor/xcode/project"
-
-require "vendor/xcode/objects/pbx_project"
-require "vendor/xcode/objects/pbx_file_reference"
-require "vendor/xcode/objects/pbx_group"
-require "vendor/xcode/objects/pbx_sources_build_phase"
-require "vendor/xcode/objects/pbx_build_file"
-require "vendor/xcode/objects/pbx_frameworks_build_phase"
-require "vendor/xcode/objects/pbx_resources_build_phase"
-require "vendor/xcode/objects/pbx_native_target"
-require "vendor/xcode/objects/pbx_container_item_proxy"
-require "vendor/xcode/objects/pbx_target_dependency"
-require "vendor/xcode/objects/pbx_variant_group"
-require "vendor/xcode/objects/pbx_shell_script_build_phase"
-require "vendor/xcode/objects/xc_build_configuration"
-require "vendor/xcode/objects/xc_configuration_list"
+module Vendor
+
+  autoload :UI,         'vendor/ui'
+  autoload :Plist,      'vendor/plist'
+  autoload :Config,     'vendor/config'
+  autoload :API,        'vendor/api'
+  autoload :Template,   'vendor/template'
+  autoload :VendorFile, 'vendor/vendor_file'
+  autoload :VendorSpec, 'vendor/vendor_spec'
+  autoload :XCode,      'vendor/xcode'
+  autoload :CLI,        'vendor/cli'
+
+  class << self
+
+    attr_writer :ui
+
+    def root
+      File.join File.expand_path("../", __FILE__)
+    end
+
+    def ui
+      @ui ||= UI.new
+    end
+
+    def library_path
+      unless @library_path
+        @library_path = File.expand_path("~/.vendor/libraries/")
+        FileUtils.mkdir_p @library_path
+      end
+      @library_path
+    end
+
+  end
+
+end
+
+$:.push Vendor.root

data/lib/vendor/api.rb

@@ -42,7 +42,7 @@ module Vendor
       end
 
       def resource(user = nil, pass = nil)
-        RestClient::Resource.new(ENV["API_URI"] || 'http://vendorage.com', :user => user, :password => pass)
+        RestClient::Resource.new(ENV["API_URI"] || 'http://vendorforge.org', :user => user, :password => pass)
       end
 
   end

data/lib/vendor/cli.rb

@@ -1,22 +1,10 @@
-require "vendor/cli/auth"
-
 module Vendor
 
   module CLI
 
-    # This reload method kinda works. It works if you change/add methods, but if you
-    # remove methods from a class, they still seem to hang around. I believe there is
-    # a fair amount of magic in rails that lets you call a reload!, but for the save
-    # of Vendor development, this will suffice.
-    def self.reload!
-      begin
-        old_verbose, $VERBOSE = $VERBOSE, nil
-        $".grep(/\/lib\/vendor/).each {|e| $".delete(e) && require(e) }
-      ensure
-        $VERBOSE = old_verbose
-      end
-      "Reloaded!"
-    end
+    autoload :Auth,    "vendor/cli/auth"
+    autoload :Console, "vendor/cli/console"
+    autoload :App,     "vendor/cli/app"
 
   end
 

data/lib/vendor/cli/app.rb

@@ -0,0 +1,140 @@
+module Vendor
+
+  module CLI
+
+    class App < Thor
+
+      class Library < Thor
+
+        desc "init", "Generate a simple vendorspec, placed in the current directory"
+        def init
+          # Use the current folder name as the name of the vendorspec
+          name = File.basename(Dir.pwd)
+
+          # Figure out who should be the author
+          username = `git config --get github.user` ||
+                     `git config --get github.user` ||
+                     `whoami`
+          email    = `git config --get user.email` ||
+                     "#{username}@example.com"
+
+          Vendor::Template.copy "vendorspec", :name => "#{name.downcase}.vendorspec",
+                                              :locals => { :name => name,
+                                                           :username => username.chomp,
+                                                           :email => email.chomp }
+        end
+
+        desc "library build VENDORSPEC_FILE", "Build a vendor package from a vendorspec file"
+        def build(file)
+          builder = Vendor::VendorSpec::Builder.new(File.expand_path(file))
+          if builder.build
+            Vendor.ui.success "Successfully built library"
+            Vendor.ui.info "Name: #{builder.name}"
+            Vendor.ui.info "Version: #{builder.version}"
+            Vendor.ui.info "File: #{builder.filename}"
+          end
+        end
+
+        desc "library publish VENDOR_FILE", "Publish a vendor package to vendorforge.org"
+        def publish(file)
+          begin
+            Vendor::CLI::Auth.with_api_key do |api_key|
+              url = Vendor::API.publish :file => File.expand_path(file), :api_key => api_key
+              Vendor.ui.success "Successfully published to #{url}"
+            end
+          rescue Vendor::API::Error => e
+            Vendor.ui.error "Error: #{e.message}"
+            exit 1
+          end
+        end
+
+        # This is a hack so Thor doesn't output 2 help commands...
+        def self.printable_tasks(all = true, subcommand = false)
+          super.delete_if { |x| x[0].match(/vendor help/) }
+        end
+
+      end
+
+      def initialize(*)
+        super
+        the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
+        Vendor.ui = UI::Shell.new(the_shell)
+        Vendor.ui.debug! if options["verbose"]
+      end
+
+      default_task :install
+      class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
+      class_option "verbose",  :type => :boolean, :banner => "Enable verbose output mode", :aliases => "-V"
+      map "--version" => :version
+
+      register Library, 'library', 'library <command>', 'Commands that will help you create and publish libraries', :hide => true
+
+      desc "install", "Install the libraries defined in your Vendorfile to the current project"
+      def install
+        vendorfile = File.expand_path("Vendorfile")
+
+        unless File.exist?(vendorfile)
+          Vendor.ui.error "Could not find Vendorfile"
+          exit 1
+        end
+
+        projects = Dir["*.xcodeproj"]
+
+        if projects.length > 1
+          Vendor.ui.error "Mutiple projects found #{projects.join(', ')}. I don't know how to deal with this yet."
+          exit 1
+        end
+
+        project = Vendor::XCode::Project.new(projects.first)
+
+        loader = Vendor::VendorFile::Loader.new
+        loader.load vendorfile
+        loader.download
+        loader.install project
+
+        if project.dirty?
+          project.save
+          Vendor.ui.success "Finished installing into #{project.name}"
+        else
+          Vendor.ui.info "No changes were made to #{project.name}"
+        end
+      end
+
+      desc "init", "Generate a simple Vendorfile, placed in the current directory"
+      def init
+        Vendor::Template.copy "Vendorfile"
+      end
+
+      desc "auth", "Login to your vendorforge.org account"
+      def auth
+        begin
+          Vendor::CLI::Auth.with_api_key do |api_key|
+            Vendor.ui.success "Successfully authenticated"
+          end
+        rescue Vendor::API::Error => e
+          Vendor.ui.error "Error: #{e.message}"
+        end
+      end
+
+      desc "console", "Load an interactive shell with the Vendor classes loaded (used for development)"
+      def console
+        # Need to clear the arguments otherwise they are passed through to RIPL
+        ARGV.clear
+        Ripl.start :binding => Vendor::CLI::Console.instance_eval{ binding }
+      end
+
+      desc "version", "Output the current version of vendor", :hide => true
+      def version
+        Vendor.ui.info Vendor::VERSION
+      end
+
+      # Exit with 1 if thor encounters an error (such as command missing)
+      def self.exit_on_failure?
+        true
+      end
+
+    end
+
+  end
+
+end