vendor 0.0.4 → 0.1

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+## 0.1 (November 8, 2011)
+
+Features:
+
+  - Initial release
+  - Build vendor libraries with `vendor library build VENDORSPEC`
+  - Create template vendor libraries with `vendor library init`
+  - Push vendor libraries to http://vendorforge.org with `vendor library push VENDOR`
+  - Install vendor libraries with `vendor install` using a Vendorfile
+  - Basic dependency management and conflict resolution
+  - Vendorspecs support adding frameworks to projects
+  - Vendorspecs support adding build settings / compiler flags to projects
+  - Vendorspecs support adding build settings / compiler flags to projects
+  - Libraries defined in the Vendorfile can reference libraries that
+    exist on http://vendorforge.org
+  - Libraries defined in the Vendorfile can be git repositories
+  - Libraries defined in the Vendorfile can be a local path
+  - Libraries do not need to be built to be installed in a Xcode project
+    as long as they have a folder that contains the source files (not
+    the project file, tests etc). To reference this folder, you can pass a
+    `:require` option to the lib to declare which folder the source files
+    live in.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vendor (0.0.3)
+    vendor (0.0.4)
       highline
       json
       rake
@@ -18,6 +18,11 @@ GEM
     columnize (0.3.4)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
+    growl (1.0.3)
+    guard (0.8.4)
+      thor (~> 0.14.6)
+    guard-rspec (0.5.0)
+      guard (>= 0.8.4)
     highline (1.6.2)
     json (1.6.1)
     linecache (0.46)
@@ -62,6 +67,9 @@ PLATFORMS
 
 DEPENDENCIES
   fakeweb
+  growl
+  guard
+  guard-rspec
   rspec
   ruby-debug
   ruby-debug19

data/Guardfile

@@ -0,0 +1,12 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})          { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')       { "spec" }
+
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})          { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
+end

data/LICENSE

@@ -1,3 +1,5 @@
+Portions Copyright (c) Chad Fowler, Rich Kilmer, Jim Weirich and others.
+
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining

data/Readme.markdown

@@ -1,6 +1,11 @@
-# Vendor – an iOS library management system
+# Vendor – an iOS library management system [![Build Status](https://secure.travis-ci.org/keithpitt/vendor.png)](http://travis-ci.org/keithpitt/vendor)
 
-[![Build Status](https://secure.travis-ci.org/keithpitt/vendor.png)](http://travis-ci.org/keithpitt/vendor)
+__Note: This software is currently in super alpha. I've been testing it
+with my own projects, and its seemed to work so far. If you have any
+problems, feel free to create an issue. If your having a problem with
+installing the vendor libraries into XCode, could you also provide me
+with your .xcodeproj file, you don't need to give me the source files
+just the project file is all I need.__
 
 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.
 
@@ -25,8 +30,6 @@ $ sudo gem install vendor
 Specify your dependencies in a Vendors file in your project's root.
 
 ```ruby
-source "https://vendorforge.com"
-
 # Downloads the latest version of DKBenchmark from
 # http://vendorforge.com
 lib "DKBenchmark"
@@ -75,9 +78,9 @@ Installing a vendor library gets the latest version of the code, and adds them d
 
 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.
 
-### Step 3: Restart XCode
+### Step 3: There is no spoon
 
-XCode sometimes goes bonkers if you try and make a modification to it while its running. It's easier just to either `vendor install` while its not running, or restart right after installing libraries.
+Or step 3 for that matter!
 
 ## Creating Libraries
 
@@ -98,17 +101,33 @@ $ vendor library init
 This command will create a blank `.vendorspec` file that looks something like this:
 
 ```ruby
-name          "DKBenchmark"
-version       "0.1"
+Vendor::Spec.new do |s|
+
+  s.name           "DKBenchmark"
+  s.version        "0.1"
+
+  s.authors        "keithpitt"
+  s.email          "me@keithpitt.com"
+  s.description    "Easy benchmarking in Objective-C using blocks"
+
+  s.homepage       "http://www.keithpitt.com"
+  s.source         "https://github.com/keithpitt/DKBenchmark"
+  s.docs           "https://github.com/keithpitt/DKBenchmark/wiki"
 
-authors       "keithpitt"
-email         "me@keithpitt.com"
-homepage      "http://www.keithpitt.com"
-description   "Easy benchmarking in Objective-C using blocks"
+  s.files          [ "DKBenchmark.h", "DKBenchmark.m" ]
 
-github        "https://github.com/keithpitt/DKBenchmark"
+  s.build_setting  :other_linker_flags, [ "-ObjC", "+lsdd" ]
+  s.build_setting  "CLANG_WARN_OBJCPP_ARC_ABI", false
+  s.build_setting  "GCC_PRECOMPILE_PREFIX_HEADER", "YES"
 
-files         [ "DKBenchmark.h", "DKBenchmark.m" ]
+  s.framework      "CoreGraphics.framework"
+  s.framework      "UIKit.framework"
+
+  s.dependency     "JSONKit", "0.5"
+  s.dependency     "ASIHTTPRequest", "~> 4.2"
+  s.dependency     "AFINetworking", "<= 2.5.a"
+
+end
 ```
 
 Change what you need to match your project, then build a packaged
@@ -162,21 +181,18 @@ After reading [this blog post](http://www.germanforblack.com/articles/false-fear
 
 So I've probably made mistake or two. But thats OK, because at least I have *something* working. If you see something you think could be done better, feel free to fork and submit a pull request :)
 
-## Contributers
-
-* [Keith Pitt](http://www.keithpitt.com)
-* [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
+Thanks to the following libraries and people, without their
+contributions to open source, Vendor would have never been...
 
+* [Rubygems](http://rubyforge.org/projects/rubygems/)
+* [Bundler](https://github.com/carlhuda/bundler)
 * [CocoaPods](https://github.com/alloy/cocoapods)
 * [Kit](https://github.com/nkpart/kit)
 * [Vendor](https://github.com/bazaarlabs/vendor)
-* [Bundler](https://github.com/carlhuda/bundler)
+* [Jari Bakken](https://github.com/jarib/plist/blob/master/lib/plist/ascii.rb)
+* [Tim Lee](http://twitter.com/#!/timothy1ee)
 
 ## Note on Patches/Pull Requests
 

data/TODO.md

@@ -0,0 +1,26 @@
+# TODO
+
+* Vendor.lock creation
+* Installing from Vendor.lock
+* Installing sub projects
+* [✔] Calculate dependencies
+* [✔] Assert if there are any version conflicts
+* [✔] Install libs from vendorforge.org
+* [✔] Installing into targets
+* [✔] Compiler flags defined in vendorspec
+* [✔] Adding frameworks from the vendorspec
+* Multiple download sources. Vendorfile API exists, but it needs to be
+  implemented into Vendor::API class
+* [✔] Version deletion
+* [✔] Installing a paticular version from http://vendorforge.org
+* Multiple line support for descriptions
+* Build https://github.com/keithpitt/gh-unit
+* Build https://github.com/keithpitt/KIF
+* Build https://github.com/keithpitt/Kiwi
+* Build https://github.com/keithpitt/expecta
+* Build https://github.com/keithpitt/cedar
+* Go over https://twitter.com/github_objc and add libs from that
+* [✔] Markdown support on descriptions
+* [✔] Fix using local, git, and libraries with no manifest/vendorspec with
+  the dependency graph
+* Build DDProgressView

data/VERSION

@@ -0,0 +1 @@
+0.1

data/lib/vendor.rb

@@ -16,6 +16,8 @@ module Vendor
   autoload :VendorSpec, 'vendor/vendor_spec'
   autoload :XCode,      'vendor/xcode'
   autoload :CLI,        'vendor/cli'
+  autoload :Version,    'vendor/version'
+  autoload :Spec,       'vendor/spec'
 
   class << self
 
@@ -25,6 +27,10 @@ module Vendor
       File.join File.expand_path("../", __FILE__)
     end
 
+    def version
+      @version ||= File.read(File.join(Vendor.root, "..", "VERSION")).chomp
+    end
+
     def ui
       @ui ||= UI.new
     end

data/lib/vendor/api.rb

@@ -4,6 +4,7 @@ module Vendor
   module API
 
     require 'json'
+    require 'tmpdir'
 
     extend self
 
@@ -15,32 +16,85 @@ module Vendor
 
     def api_key(username, password)
       perform do
-        response = resource(username, password)["users/#{username}/api_key.json"].get
+        url = resource(username, password)["users/#{username}/api_key.json"]
+        Vendor.ui.debug "GET #{url}"
+
+        response = url.get
         JSON.parse(response.body)["api_key"]
       end
     end
 
+    def meta(name)
+      @meta ||= {}
+
+      perform :on_404 => "Could not find a valid vendor '#{name}'" do
+        unless @meta[name]
+          url = resource["vendors/#{slugerize(name)}.json"]
+          Vendor.ui.debug "GET #{url}"
+
+          @meta[name] = JSON.parse(url.get.body)
+        end
+
+        @meta[name]
+      end
+    end
+
+    def download(name, version)
+      perform do
+        info = meta(name)
+
+        # Does the version exist?
+        unless info['versions'].find { |v| Vendor::Version.create(v[0]) == Vendor::Version.create(version) }
+          raise Error.new("Could not find a valid version for '#{name}' that matches '#{version}'")
+        end
+
+        url = resource["vendors/#{slugerize(name)}/versions/#{version}/download"]
+        Vendor.ui.debug "GET #{url}"
+        Vendor.ui.info "Downloading #{name} #{version}"
+
+        binary = url.get
+
+        filename = "#{name}-#{version}.vendor"
+        tmpfile = File.join(Dir.mktmpdir(filename), filename)
+
+        file = File.new(tmpfile, 'w')
+        file.write binary
+        file.close
+
+        file
+      end
+    end
+
     def push(options)
       perform do
-        response = resource["vendors.json"].post :version => { :package => File.new(options[:file]) }, :api_key => options[:api_key]
-        body = JSON.parse(response.body)
+        url = resource["vendors.json"]
+        Vendor.ui.debug "POST #{url}"
+
+        response = url.post :version => { :package => File.new(options[:file]) }, :api_key => options[:api_key]
+        json = JSON.parse(response.body)
 
-        if body["status"] == "ok"
-          body["url"]
+        if json["status"] == "ok"
+          json["url"]
         else
-          raise Error.new(body["message"])
+          raise Error.new(json["message"])
         end
       end
     end
 
     private
 
-      def perform(&block)
+      def slugerize(string)
+        string.gsub(/[^a-zA-Z0-9\-\_\s]/, ' ').gsub(/\s+/, '-')
+      end
+
+      def perform(options = {}, &block)
         begin
           yield
         rescue RestClient::Exception => e
           if e.http_code == 401
             raise Error.new("Login or password is incorrect")
+          elsif e.http_code == 404
+            raise Error.new(options[:on_404] || "Resource could not be found")
           else
             raise Error.new("Could not complete request. Server returned a status code of #{e.http_code}")
           end

data/lib/vendor/cli/app.rb

@@ -18,7 +18,7 @@ module Vendor
           email    = `git config --get user.email` ||
                      "#{username}@example.com"
 
-          Vendor::Template.copy "vendorspec", :name => "#{name.downcase}.vendorspec",
+          Vendor::Template.copy "vendorspec", :name => "#{name}.vendorspec",
                                               :locals => { :name => name,
                                                            :username => username.chomp,
                                                            :email => email.chomp }
@@ -62,10 +62,11 @@ module Vendor
         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
+      map "-v" => :version
 
       register Library, 'library', 'library <command>', 'Commands that will help you create and publish libraries', :hide => true
 
@@ -89,7 +90,6 @@ module Vendor
 
         loader = Vendor::VendorFile::Loader.new
         loader.load vendorfile
-        loader.download
         loader.install project
 
         if project.dirty?
@@ -125,7 +125,7 @@ module Vendor
 
       desc "version", "Output the current version of vendor", :hide => true
       def version
-        Vendor.ui.info Vendor::VERSION
+        Vendor.ui.info Vendor.version
       end
 
       # Exit with 1 if thor encounters an error (such as command missing)

data/lib/vendor/cli/console.rb

@@ -4,6 +4,9 @@ module Vendor
 
     module Console
 
+      RESOURCE_PATH = File.join(Vendor.root, "..", "spec", "support", "resources")
+      PROJECT_RESOURCE_PATH = File.join(RESOURCE_PATH, "projects")
+
       # 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
@@ -18,6 +21,10 @@ module Vendor
         "Reloaded!"
       end
 
+      def self.example_project!(name)
+        Vendor::XCode::Project.new(File.join(PROJECT_RESOURCE_PATH, "#{name}/#{name}.xcodeproj"))
+      end
+
     end
 
   end

data/lib/vendor/spec.rb

@@ -0,0 +1,98 @@
+module Vendor
+
+  class Spec
+
+    ATTRIBUTES = [ :name, :version, :email, :files, :homepage,
+                   :description, :authors, :source, :docs ]
+
+    attr_reader :dependencies
+    attr_reader :frameworks
+    attr_reader :build_settings
+
+    BUILD_SETTING_NAMES = {
+      :other_linker_flags => "OTHER_LDFLAGS"
+    }
+
+    ATTRIBUTES.each do |attr|
+      class_eval %{
+        def #{attr}(*args)
+          if args.length == 1
+            self.#{attr} = args.first
+          else
+            @attributes[:#{attr}]
+          end
+        end
+
+        def #{attr}=(value)
+          @attributes[:#{attr}] = value
+        end
+      }
+    end
+
+    def self.load(file)
+      # Before evaling we need to chdir into the location of the vendorspec. This is
+      # so if the vendorfile does any system calls, they're expecting to be in the right
+      # right location.
+      before = Dir.pwd
+      Dir.chdir File.dirname(file)
+      spec = eval File.read(file), nil, file
+      Dir.chdir before
+      spec
+    end
+
+    def initialize(&block)
+      @attributes = {}
+      yield(self) if block_given?
+    end
+
+    def build_setting(setting, value)
+      @build_settings ||= []
+
+      # If you pass in a symbol, it'll try and map it.
+      if setting.kind_of?(Symbol)
+        symbol = setting
+        setting = BUILD_SETTING_NAMES[symbol]
+        raise StandardError.new("No mapping for '#{symbol}' in #{BUILD_SETTING_NAMES.inspect}") unless setting
+      end
+
+      # YES/NO Mappings
+      if value === true
+        value = "YES"
+      elsif value === false
+        value = "NO"
+      end
+
+      @build_settings << [ setting, value ]
+    end
+
+    def framework(name)
+      @frameworks ||= []
+      @frameworks << name
+    end
+
+    def dependency(name, version = nil)
+      @dependencies ||= []
+      @dependencies << [ name, version ]
+    end
+
+    def validate!
+      [ :name, :version, :email, :files ].each do |key|
+        value = self.send(key)
+
+        if value.respond_to?(:empty?) ? value.empty? : !value
+          raise StandardError.new("Specification is missing the `#{key}` option")
+        end
+      end
+    end
+
+    def to_json
+      [ ATTRIBUTES, :dependencies, :frameworks, :build_settings ].flatten.inject({}) do |hash, attr|
+        val = self.send(attr)
+        hash[attr] = val unless val.nil?
+        hash
+      end.to_json
+    end
+
+  end
+
+end