vendor 0.0.1 → 0.0.2

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

@@ -0,0 +1,22 @@
+module Vendor
+  module VendorFile
+    module Library
+
+      class Local < Base
+
+        attr_accessor :path
+
+        def initialize(*args)
+          super(*args)
+          @source_tree = :absolute
+        end
+
+        def cache_path
+          File.expand_path(path)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Vendor
+  module VendorFile
+    module Library
+
+      class Remote < Base
+
+        attr_accessor :version
+        attr_accessor :sources
+
+        def download
+          Vendor.ui.info "download #{name} version #{version} from #{sources} to #{cache_path}"
+        end
+
+      end
+
+    end
+  end
+end

data/lib/vendor/vendor_file/loader.rb

@@ -0,0 +1,36 @@
+module Vendor
+  module VendorFile
+
+    class Loader
+
+      require 'fileutils'
+
+      attr_reader :dsl
+
+      def initialize
+        @dsl = Vendor::VendorFile::DSL.new
+      end
+
+      def load(filename)
+        @dsl.instance_eval(File.read(filename), filename)
+      end
+
+      def download
+        @dsl.libraries.each do |lib|
+          if lib.respond_to?(:sources=)
+            lib.sources = @dsl.sources
+          end
+          lib.download
+        end
+      end
+
+      def install(project)
+        @dsl.libraries.each do |lib|
+          lib.install project
+        end
+      end
+
+    end
+
+  end
+end

data/lib/vendor/vendor_file/source.rb

@@ -0,0 +1,21 @@
+module Vendor
+  module VendorFile
+
+    class Source
+
+      MAPPING = { :vendorforge => "http://vendorforge.com" }
+
+      attr_accessor :uri
+
+      def initialize(uri)
+        if uri.kind_of?(Symbol)
+          self.uri = MAPPING[uri]
+        else
+          self.uri = uri
+        end
+      end
+
+    end
+
+  end
+end

data/lib/vendor/vendor_spec.rb

@@ -0,0 +1,11 @@
+module Vendor
+
+  module VendorSpec
+
+    autoload :Builder, "vendor/vendor_spec/builder"
+    autoload :DSL, "vendor/vendor_spec/dsl"
+    autoload :Loader, "vendor/vendor_spec/loader"
+
+  end
+
+end

data/lib/vendor/vendor_spec/builder.rb

@@ -7,7 +7,7 @@ module Vendor
       require 'tmpdir'
       require 'find'
       require 'zip/zipfilesystem'
-      require 'colorize'
+      require 'json'
 
       attr_reader :name
       attr_reader :version
@@ -47,14 +47,21 @@ module Vendor
         def copy_files(data_dir)
           data_files = []
 
-          @vendor_spec[:files].each do |file|
+          # Remove files that are within folders with a ".", such as ".bundle"
+          # and ".frameworks"
+          copy_files = @vendor_spec[:files].reject { |file| file =~ /\/?[^\/]+\.[^\/]+\// }
+
+          copy_files.each do |file|
             dir = File.dirname(file)
             path = File.join(@folder, file)
             copy_to_dir = File.expand_path(File.join(data_dir, dir))
             copy_to_file = File.join(copy_to_dir, File.basename(file))
 
+            Vendor.ui.debug "Creating dir #{copy_to_dir}"
             FileUtils.mkdir_p copy_to_dir
-            FileUtils.cp path, copy_to_file
+
+            Vendor.ui.debug "Copying #{path} to #{copy_to_file}"
+            FileUtils.cp_r path, copy_to_file
 
             data_files << copy_to_file
           end

data/lib/vendor/version.rb

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

data/lib/vendor/xcode.rb

@@ -0,0 +1,10 @@
+module Vendor
+
+  module XCode
+
+    autoload :Proxy,   "vendor/xcode/proxy"
+    autoload :Project, "vendor/xcode/project"
+
+  end
+
+end

data/lib/vendor/xcode/project.rb

@@ -6,14 +6,19 @@ module Vendor::XCode
 
     require 'fileutils'
 
+    attr_reader :name
     attr_reader :object_version
     attr_reader :archive_version
     attr_reader :objects
     attr_reader :root_object
 
+    attr_accessor :dirty
+
     def initialize(project_folder)
       @project_folder = project_folder
       @pbxproject = ::File.join(project_folder, "project.pbxproj")
+      @name = File.basename(project_folder).split(".").first
+      @dirty = false
 
       reload
     end
@@ -36,11 +41,13 @@ module Vendor::XCode
       @objects_by_id = {}
 
       @objects = parsed['objects'].map do |id, attributes|
-        klass = Vendor::XCode::Objects.const_get(attributes['isa'])
+        klass = Vendor::XCode::Proxy.const_get(attributes['isa'])
 
         @objects_by_id[id] = klass.new(:project => self, :id => id, :attributes => attributes)
       end
 
+      @objects.each { |object| object.send(:after_initialize) }
+
       @root_object = @objects_by_id[parsed['rootObject']]
     end
 
@@ -52,16 +59,27 @@ module Vendor::XCode
       root_object.targets.find { |x| x.name == name }
     end
 
-    def find_and_make_group(path)
+    def find_group(path)
       current = root_object.main_group
 
       path.split("/").each do |name|
-        group = current.children.find { |x| x.name == name }
+        current = current.children.find { |x| (x.respond_to?(:name) ? x.name : x.path) == name }
+        return nil unless current
+      end
+
+      current
+    end
+
+    def create_group(path)
+      current = root_object.main_group
+
+      path.split("/").each do |name|
+        group = current.children.find { |x| (x.respond_to?(:name) ? x.name : x.path) == name }
 
         unless group
-          group = Vendor::XCode::Objects::PBXGroup.new(:project => self,
-                                                          :id => Vendor::XCode::Object.generate_id,
-                                                          :attributes => { 'path' => name, 'sourceTree' => '<group>', 'children' => [] })
+          group = Vendor::XCode::Proxy::PBXGroup.new(:project => self,
+                                                          :id => Vendor::XCode::Proxy::Base.generate_id,
+                                                  :attributes => { 'path' => name, 'sourceTree' => '<group>', 'children' => [] })
 
           @objects_by_id[group.id] = group
 
@@ -72,34 +90,106 @@ module Vendor::XCode
         current = group
       end
 
+      # Mark as dirty
+      @dirty = true
+
       current
     end
 
+    def remove_group(path)
+      group = find_group(path)
+
+      # If we have the group
+      if group
+
+        # Remove the children from the file system
+        group.children.each do |child|
+          if child.group? # Is it a group?
+            remove_group child.full_path # Recursivley remove the child group
+          elsif child.file? # Or a file
+            file = File.expand_path(File.join(@project_folder, "..", child.full_path))
+
+            # Remove the file from the filesystem
+            if File.exist?(file)
+              FileUtils.rm_rf file
+            end
+          else
+            Vendor.ui.error "Couldn't remove object: #{child}"
+          end
+
+          # Remove the file from the parent
+          child.parent.attributes['children'].delete child.id
+        end
+
+        # Remove the group from the parent
+        group.parent.attributes['children'].delete group.id
+
+        # Mark as dirty
+        @dirty = true
+
+      else
+        false
+      end
+    end
+
     def add_file(options)
-      require_options options, :targets, :path, :file
+      require_options options, :path, :file, :source_tree
 
       # Ensure file exists
       raise StandardError.new("Could not find file `#{options[:file]}`") unless File.exists?(options[:file])
 
-      # Ensure the path exists
-      path = File.join(@project_folder, "..", options[:path])
-      FileUtils.mkdir_p path
+      # Create the group
+      group = create_group(options[:path])
 
-      # Copy the file
+      # File type
+      type = Vendor::XCode::Proxy::PBXFileReference.file_type_from_extension(File.extname(options[:file]))
+
+      # The file name
       name = File.basename(options[:file])
-      FileUtils.cp options[:file], File.join(path, name)
 
-      # Add the file to XCode
-      group = find_and_make_group(options[:path])
-      relative_path = File.join(options[:path], name)
-      file_type = Vendor::XCode::Objects::PBXFileReference.file_type_from_extension(File.extname(options[:file]))
+      attributes = {
+        'lastKnownFileType' => type,
+        'sourceTree' => "<#{options[:source_tree].to_s}>"
+      }
 
-      file = Vendor::XCode::Objects::PBXFileReference.new(:project => self,
-                                                             :id => Vendor::XCode::Object.generate_id,
-                                                             :attributes => { 'path' => name, 'lastKnownFileType' => file_type, 'sourceTree' => '<group>' })
+      # Handle the different source tree types
+      if options[:source_tree] == :group
 
+        # Ensure the path exists on the filesystem
+        path = File.join(@project_folder, "..", options[:path])
+        FileUtils.mkdir_p path
+
+        # Copy the file
+        FileUtils.cp_r options[:file], File.join(path, name)
+
+        # Set the path of the file
+        attributes['path'] = name
+
+      elsif options[:source_tree] == :absolute
+
+        # Set the path and the name of the file
+        attributes['name'] = name
+        attributes['path'] = options[:file]
+
+      else
+
+        # Could not handle that option
+        raise StandardError.new("Invalid :source_tree option `#{options[:source_tree].to_s}`")
+
+      end
+
+      # Add the file to XCode
+      file = Vendor::XCode::Proxy::PBXFileReference.new(:project => self,
+                                                             :id => Vendor::XCode::Proxy::Base.generate_id,
+                                                     :attributes => attributes)
+
+      # Add the file id to the groups children
       group.attributes['children'] << file.id
 
+      # Mark as dirty
+      @dirty = true
+
+      # Add the file to the internal index
       @objects_by_id[file.id] = file
     end
 
@@ -116,6 +206,29 @@ module Vendor::XCode
     def save
       open(@pbxproject, 'w+') do |f|
         f << to_ascii_plist
+      end if valid?
+
+      # Not dirty anymore
+      @dirty = false
+    end
+
+    def dirty?
+      @dirty
+    end
+
+    def valid?
+      begin
+        # Try and parse the plist again. If it parses, then we've
+        # got valid syntax, if it fails, it will raise a parse error. We
+        # know we've done something bad at this point.
+        Vendor::Plist.parse_ascii(to_ascii_plist)
+
+        true
+      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
+
+        false
       end
     end
 

data/lib/vendor/xcode/proxy.rb

@@ -0,0 +1,28 @@
+module Vendor
+
+  module XCode
+
+    module Proxy
+
+      autoload :Base,                      "vendor/xcode/proxy/base"
+      autoload :PBXProject,                "vendor/xcode/proxy/pbx_project"
+      autoload :PBXFileReference,          "vendor/xcode/proxy/pbx_file_reference"
+      autoload :PBXGroup,                  "vendor/xcode/proxy/pbx_group"
+      autoload :PBXSourcesBuildPhase,      "vendor/xcode/proxy/pbx_sources_build_phase"
+      autoload :PBXBuildFile,              "vendor/xcode/proxy/pbx_build_file"
+      autoload :PBXFrameworksBuildPhase,   "vendor/xcode/proxy/pbx_frameworks_build_phase"
+      autoload :PBXResourcesBuildPhase,    "vendor/xcode/proxy/pbx_resources_build_phase"
+      autoload :PBXNativeTarget,           "vendor/xcode/proxy/pbx_native_target"
+      autoload :PBXContainerItemProxy,     "vendor/xcode/proxy/pbx_container_item_proxy"
+      autoload :PBXTargetDependency,       "vendor/xcode/proxy/pbx_target_dependency"
+      autoload :PBXVariantGroup,           "vendor/xcode/proxy/pbx_variant_group"
+      autoload :PBXShellScriptBuildPhase,  "vendor/xcode/proxy/pbx_shell_script_build_phase"
+      autoload :XCBuildConfiguration,      "vendor/xcode/proxy/xc_build_configuration"
+      autoload :XCConfigurationList,       "vendor/xcode/proxy/xc_configuration_list"
+      autoload :XCVersionGroup,            "vendor/xcode/proxy/xc_version_group"
+
+    end
+
+  end
+
+end

data/lib/vendor/xcode/{object.rb → proxy/base.rb}

@@ -1,40 +1,45 @@
-module Vendor::XCode
+module Vendor::XCode::Proxy
 
-  class Object
+  class Base
 
     attr_accessor :id
+    attr_accessor :parent
     attr_reader :attributes
 
-    # I don't know what the ID's are made up of in XCode,
-    # so lets just generate a 24 character string.
-    def self.generate_id
-      (0...24).map { '%02X' % rand(256) }.join
-    end
+    class << self
 
-    def self.object_references
-      @references || []
-    end
+      # I don't know what the ID's are made up of in XCode,
+      # so lets just generate a 24 character string.
+      def generate_id
+        (0...24).map { '%02X' % rand(256) }.join
+      end
 
-    def self.reference(name)
-      attribute = attribute_name(name)
+      def object_references
+        @references || []
+      end
 
-      define_method name do
-        value = @attributes[attribute]
-        if value.kind_of?(Array)
-          value.map { |id| @project.find_object(id) }
-        else
-          @project.find_object(value)
+      def reference(name)
+        attribute = attribute_name(name)
+
+        define_method name do
+          value = @attributes[attribute]
+          if value.kind_of?(Array)
+            value.map { |id| @project.find_object(id) }
+          else
+            @project.find_object(value)
+          end
         end
+
+        @references ||= []
+        @references << name
       end
 
-      @references ||= []
-      @references << name
-    end
+      # References are stored in camel case in the project file
+      def attribute_name(name)
+        camelized = name.to_s.gsub(/[^\w]/, '').gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+        camelized[0].chr.downcase + camelized[1..-1]
+      end
 
-    # References are stored in camel case in the project file
-    def self.attribute_name(name)
-      camelized = name.to_s.gsub(/[^\w]/, '').gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-      camelized[0].chr.downcase + camelized[1..-1]
     end
 
     def initialize(options)
@@ -74,6 +79,16 @@ module Vendor::XCode
       end
     end
 
+    def respond_to?(method)
+      name = self.class.attribute_name(method)
+
+      if @attributes.has_key?(name)
+        true
+      else
+        super
+      end
+    end
+
     def write_attribute(name, value)
       @attributes[name.to_s] = value
     end
@@ -86,8 +101,20 @@ module Vendor::XCode
       @attributes.to_ascii_plist
     end
 
+    def group?
+      false
+    end
+
+    def file?
+      false
+    end
+
     private
 
+      def after_initialize
+        # Do nothing by default
+      end
+
       # I miss active support...
       def underscore(string)
         string.gsub(/::/, '/').