xcodeproj 0.0.2 → 0.1.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Eloy Durán <eloy.de.enige@gmail.com>
+Copyright (c) 2012 Eloy Durán <eloy.de.enige@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,8 @@
 # Xcodeproj
 
-Xcodeproj lets you create and modify Xcode projects from [MacRuby][macruby].
+[![Build Status](https://secure.travis-ci.org/CocoaPods/Xcodeproj.png)](https://secure.travis-ci.org/CocoaPods/Xcodeproj)
+
+Xcodeproj lets you create and modify Xcode projects from [Ruby][ruby].
 Script boring management tasks or build Xcode-friendly libraries. Also includes
 support for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
 
@@ -10,16 +12,10 @@ static library from scratch, for both iOS and OSX.
 
 ## Installing Xcodeproj
 
-You’ll need MacRuby. xcodeproj itself installs through RubyGems, the Ruby
-package manager. Download and install [version 0.10][macruby-dl] and then
-perform the following command:
-
-    $ sudo macgem install xcodeproj
-
-The load time can be improved a bit by compiling the Ruby source files:
+Xcodeproj itself installs through RubyGems, the Ruby package manager. Install it
+by performing the following command:
 
-    $ sudo macgem install rubygems-compile
-    $ sudo macgem compile xcodeproj
+    $ sudo gem install xcodeproj
 
 
 ## Colaborate
@@ -35,9 +31,11 @@ If you're really oldschool and you want to discuss Xcodeproj development you
 can join #cocoapods on irc.freenode.net.
 
 
-## Contributors
+## Authors
 
 * [Nolan Waite](https://github.com/nolanw)
+* [Luke Redpath](https://github.com/lukeredpath)
+* [Eloy Durán](https://github.com/alloy)
 
 
 ## LICENSE
@@ -49,8 +47,7 @@ Included in this package is the [inflector part of ActiveSupport][activesupport]
 which is also available under the MIT license.
 
 [twitter]: http://twitter.com/CocoaPodsOrg
-[macruby]: http://www.macruby.org
-[macruby-dl]: http://www.macruby.org/files
+[ruby]: http://www.ruby-lang.org/en/
 [xcodeproj]: https://github.com/cocoapods/xcodeproj
 [tickets]: https://github.com/cocoapods/xcodeproj/issues
 [license]: xcodeproj/blob/master/LICENSE

data/ext/xcodeproj/extconf.rb

@@ -0,0 +1,42 @@
+require 'mkmf'
+
+# backport from 1.9.x
+unless defined?(have_framework) == "method"
+  def have_framework(fw, &b)
+    checking_for fw do
+      src = cpp_include("#{fw}/#{fw}.h") << "\n" "int main(void){return 0;}"
+      if try_link(src, opt = "-ObjC -framework #{fw}", &b)
+        $defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp))
+        $LDFLAGS << " " << opt
+        true
+      else
+        false
+      end
+    end
+  end
+end
+
+# Ensure that we can actually set the -std flag
+$CFLAGS = $CFLAGS.sub('$(cflags) ', '')
+$CFLAGS += ' ' + ENV['CFLAGS'] if ENV['CFLAGS']
+
+checking_for "-std=c99 option to compiler" do
+  $CFLAGS += " -std=c99" if try_compile '', '-std=c99'
+end
+
+unless have_framework('CoreFoundation')
+  if have_library('CoreFoundation')
+    # this is needed for opencflite, assume it's on linux
+    $defs << '-DTARGET_OS_LINUX'
+  else
+    $stderr.puts "CoreFoundation is needed to build the Xcodeproj C extension."
+    exit -1
+  end
+end
+
+have_header 'CoreFoundation/CoreFoundation.h'
+have_header 'CoreFoundation/CFStream.h'
+have_header 'CoreFoundation/CFPropertyList.h'
+
+create_header
+create_makefile 'xcodeproj_ext'

data/ext/xcodeproj/xcodeproj_ext.c

@@ -0,0 +1,201 @@
+// TODO
+// * free memory when raising
+
+#include "extconf.h"
+
+#include "ruby.h"
+#include "ruby/st.h"
+#include "CoreFoundation/CoreFoundation.h"
+#include "CoreFoundation/CFStream.h"
+#include "CoreFoundation/CFPropertyList.h"
+
+VALUE Xcodeproj = Qnil;
+
+
+static VALUE
+cfstr_to_str(const void *cfstr) {
+  long len = (long)CFStringGetLength(cfstr);
+  char *buf = (char *)malloc(len+1);
+  assert(buf != NULL);
+  CFStringGetCString(cfstr, buf, len+1, kCFStringEncodingUTF8);
+  register VALUE str = rb_str_new(buf, len);
+  free(buf);
+  return str;
+}
+
+// Coerces to String as well.
+static CFStringRef
+str_to_cfstr(VALUE str) {
+  return CFStringCreateWithCString(NULL, RSTRING_PTR(rb_String(str)), kCFStringEncodingUTF8);
+}
+
+
+static VALUE
+generate_uuid(void) {
+  CFUUIDRef uuid = CFUUIDCreate(NULL);
+  CFStringRef strRef = CFUUIDCreateString(NULL, uuid);
+  CFRelease(uuid);
+
+  CFArrayRef components = CFStringCreateArrayBySeparatingStrings(NULL, strRef, CFSTR("-"));
+  CFRelease(strRef);
+  strRef = CFStringCreateByCombiningStrings(NULL, components, CFSTR(""));
+  CFRelease(components);
+
+  UniChar buffer[24];
+  CFStringGetCharacters(strRef, CFRangeMake(0, 24), buffer);
+  CFStringRef strRef2 = CFStringCreateWithCharacters(NULL, buffer, 24);
+
+  VALUE str = cfstr_to_str(strRef2);
+  CFRelease(strRef);
+  CFRelease(strRef2);
+  return str;
+}
+
+
+static void
+hash_set(const void *keyRef, const void *valueRef, void *hash) {
+  VALUE key = cfstr_to_str(keyRef);
+  register VALUE value = Qnil;
+
+  CFTypeID valueType = CFGetTypeID(valueRef);
+  if (valueType == CFStringGetTypeID()) {
+    value = cfstr_to_str(valueRef);
+
+  } else if (valueType == CFDictionaryGetTypeID()) {
+    value = rb_hash_new();
+    CFDictionaryApplyFunction(valueRef, hash_set, (void *)value);
+
+  } else if (valueType == CFArrayGetTypeID()) {
+    value = rb_ary_new();
+    CFIndex i, count = CFArrayGetCount(valueRef);
+    for (i = 0; i < count; i++) {
+      CFStringRef x = CFArrayGetValueAtIndex(valueRef, i);
+      if (CFGetTypeID(x) == CFStringGetTypeID()) {
+        rb_ary_push(value, cfstr_to_str(x));
+      } else {
+        rb_raise(rb_eTypeError, "Plist array value contains a object type unsupported by Xcodeproj.");
+      }
+    }
+
+  } else {
+    rb_raise(rb_eTypeError, "Plist contains a hash value object type unsupported by Xcodeproj.");
+  }
+
+  rb_hash_aset((VALUE)hash, key, value);
+}
+
+static int
+dictionary_set(st_data_t key, st_data_t value, CFMutableDictionaryRef dict) {
+  CFStringRef keyRef = str_to_cfstr(key);
+
+  CFTypeRef valueRef = NULL;
+  if (TYPE(value) == T_HASH) {
+    valueRef = CFDictionaryCreateMutable(NULL,
+                                         0,
+                                         &kCFTypeDictionaryKeyCallBacks,
+                                         &kCFTypeDictionaryValueCallBacks);
+    st_foreach(RHASH_TBL(value), dictionary_set, (st_data_t)valueRef);
+
+  } else if (TYPE(value) == T_ARRAY) {
+    long i, count = RARRAY_LEN(value);
+    valueRef = CFArrayCreateMutable(NULL, count, &kCFTypeArrayCallBacks);
+    for (i = 0; i < count; i++) {
+      CFStringRef x = str_to_cfstr(RARRAY_PTR(value)[i]);
+      CFArrayAppendValue((CFMutableArrayRef)valueRef, x);
+      CFRelease(x);
+    }
+
+  } else {
+    valueRef = str_to_cfstr(value);
+  }
+
+  CFDictionaryAddValue(dict, keyRef, valueRef);
+  CFRelease(keyRef);
+  CFRelease(valueRef);
+  return ST_CONTINUE;
+}
+
+static CFURLRef
+str_to_url(VALUE path) {
+#ifdef FilePathValue
+  VALUE p = FilePathValue(path);
+#else
+  VALUE p = rb_String(path);
+#endif
+  CFURLRef fileURL = CFURLCreateFromFileSystemRepresentation(NULL, RSTRING_PTR(p), RSTRING_LEN(p), false);
+  if (!fileURL) {
+    rb_raise(rb_eArgError, "Unable to create CFURL from `%s'.", RSTRING_PTR(rb_inspect(path)));
+  }
+  return fileURL;
+}
+
+
+// TODO handle errors
+static VALUE
+read_plist(VALUE self, VALUE path) {
+  CFPropertyListRef dict;
+  CFStringRef       errorString;
+  CFDataRef         resourceData;
+  SInt32            errorCode;
+
+  CFURLRef fileURL = str_to_url(path);
+  if (CFURLCreateDataAndPropertiesFromResource(NULL, fileURL, &resourceData, NULL, NULL, &errorCode)) {
+    CFRelease(fileURL);
+  }
+  if (!resourceData) {
+    rb_raise(rb_eArgError, "Unable to read data from `%s'", RSTRING_PTR(rb_inspect(path)));
+  }
+
+  dict = CFPropertyListCreateFromXMLData(NULL, resourceData, kCFPropertyListImmutable, &errorString);
+  if (!dict) {
+    rb_raise(rb_eArgError, "Unable to read plist data from `%s': %s", RSTRING_PTR(rb_inspect(path)), RSTRING_PTR(cfstr_to_str(errorString)));
+  }
+  CFRelease(resourceData);
+
+  register VALUE hash = rb_hash_new();
+  CFDictionaryApplyFunction(dict, hash_set, (void *)hash);
+  CFRelease(dict);
+
+  return hash;
+}
+
+static VALUE
+write_plist(VALUE self, VALUE hash, VALUE path) {
+  VALUE h = rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
+  if (NIL_P(h)) {
+    rb_raise(rb_eTypeError, "%s can't be coerced to Hash", rb_obj_classname(hash));
+  }
+
+  CFMutableDictionaryRef dict = CFDictionaryCreateMutable(NULL,
+                                                          0,
+                                                          &kCFTypeDictionaryKeyCallBacks,
+                                                          &kCFTypeDictionaryValueCallBacks);
+
+  st_foreach(RHASH_TBL(h), dictionary_set, (st_data_t)dict);
+
+  CFURLRef fileURL = str_to_url(path);
+  CFWriteStreamRef stream = CFWriteStreamCreateWithFile(NULL, fileURL);
+  CFRelease(fileURL);
+
+  CFIndex success = 0;
+  if (CFWriteStreamOpen(stream)) {
+    CFStringRef errorString;
+    success = CFPropertyListWriteToStream(dict, stream, kCFPropertyListXMLFormat_v1_0, &errorString);
+    if (!success) {
+      CFShow(errorString);
+    }
+  } else {
+    printf("Unable to open stream!\n");
+  }
+
+  CFRelease(dict);
+  return success ? Qtrue : Qfalse;
+}
+
+
+void Init_xcodeproj_ext() {
+  Xcodeproj = rb_define_module("Xcodeproj");
+  rb_define_singleton_method(Xcodeproj, "generate_uuid", generate_uuid, 0);
+  rb_define_singleton_method(Xcodeproj, "read_plist", read_plist, 1);
+  rb_define_singleton_method(Xcodeproj, "write_plist", write_plist, 2);
+}

data/lib/xcodeproj.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
   
   autoload :Config,    'xcodeproj/config'
   autoload :Project,   'xcodeproj/project'

data/lib/xcodeproj/inflector.rb

@@ -346,7 +346,7 @@ module Xcodeproj
 end
 
 # String inflections define new methods on the String class to transform names for different purposes.
-class NSString
+class String
   include Xcodeproj::ActiveSupport
 
   # Returns the plural form of the word in the string.

data/lib/xcodeproj/project.rb

@@ -1,6 +1,6 @@
-framework 'Foundation'
 require 'fileutils'
 require 'xcodeproj/inflector'
+require 'xcodeproj/xcodeproj_ext'
 
 module Xcodeproj
   class Project
@@ -194,12 +194,7 @@ module Xcodeproj
       private
 
       def generate_uuid
-        _uuid = CFUUIDCreate(nil)
-        uuid = CFUUIDCreateString(nil, _uuid)
-        CFRelease(_uuid)
-        CFMakeCollectable(uuid)
-        # Xcode's version is actually shorter, not worrying about collisions too much right now.
-        uuid.gsub('-', '')[0..23]
+        Xcodeproj.generate_uuid
       end
 
       def list_by_class(uuids, klass, scoped = nil, &block)
@@ -221,7 +216,7 @@ module Xcodeproj
     # valid classes in a Xcode project. A new PBXObject subclass is created
     # for the constant and returned.
     def self.const_missing(name)
-      if name =~ /^(PBX|XC)/
+      if name.to_s =~ /^(PBX|XC)/
         klass = Class.new(PBXObject)
         const_set(name, klass)
         klass
@@ -534,7 +529,7 @@ module Xcodeproj
 
       # Only makes sense on lists that contain mixed classes.
       def select_by_class(klass)
-        scoped = @scoped_hash.select { |_, attr| attr['isa'] == klass.isa }
+        scoped = Hash[*@scoped_hash.select { |_, attr| attr['isa'] == klass.isa }.flatten]
         PBXObjectList.new(klass, @project, scoped) do |object|
           # Objects added to the subselection should still use the same
           # callback as this list.
@@ -558,7 +553,7 @@ module Xcodeproj
     def initialize(xcodeproj = nil)
       if xcodeproj
         file = File.join(xcodeproj, 'project.pbxproj')
-        @plist = NSMutableDictionary.dictionaryWithContentsOfFile(file.to_s)
+        @plist = Xcodeproj.read_plist(file.to_s)
       else
         @plist = {
           'archiveVersion' => '1',
@@ -658,7 +653,7 @@ module Xcodeproj
     def save_as(projpath)
       projpath = projpath.to_s
       FileUtils.mkdir_p(projpath)
-      @plist.writeToFile(File.join(projpath, 'project.pbxproj'), atomically:true)
+      Xcodeproj.write_plist(@plist, File.join(projpath, 'project.pbxproj'))
     end
   end
 end

data/lib/xcodeproj/workspace.rb

@@ -1,12 +1,12 @@
-framework 'Foundation'
 require 'fileutils'
+require 'rexml/document'
 
 module Xcodeproj
   class Workspace
     def initialize(*projpaths)
       @projpaths = projpaths
     end
-    
+
     def self.new_from_xcworkspace(path)
       begin
         from_s(File.read(File.join(path, 'contents.xcworkspacedata')))
@@ -14,36 +14,37 @@ module Xcodeproj
         new
       end
     end
-    
+
     def self.from_s(xml)
-      doc = NSXMLDocument.alloc.initWithXMLString(xml, options:0, error:nil)
-      projpaths = doc.nodesForXPath("/Workspace/FileRef", error:nil).map do |node|
-        node.attributeForName("location").stringValue.sub(/^group:/, '')
+      document = REXML::Document.new(xml)
+      projpaths = document.get_elements("/Workspace/FileRef").map do |node|
+        node.attribute("location").to_s.sub(/^group:/, '')
       end
       new(*projpaths)
     end
-    
+
     attr_reader :projpaths
-    
+
     def <<(projpath)
       @projpaths << projpath
     end
-    
+
     def include?(projpath)
       @projpaths.include?(projpath)
     end
-    
+
     TEMPLATE = %q[<?xml version="1.0" encoding="UTF-8"?><Workspace version="1.0"></Workspace>]
+
     def to_s
-      doc = NSXMLDocument.alloc.initWithXMLString(TEMPLATE, options:0, error:nil)
-      @projpaths.each do |projpath|
-        el = NSXMLNode.elementWithName("FileRef")
-        el.addAttribute(NSXMLNode.attributeWithName("location", stringValue:"group:#{projpath}"))
-        doc.rootElement.addChild(el)
-      end
-      NSString.alloc.initWithData(doc.XMLData, encoding:NSUTF8StringEncoding)
+      REXML::Document.new(TEMPLATE).tap do |document|
+        @projpaths.each do |projpath|
+          document.root << REXML::Element.new("FileRef").tap do |el|
+            el.attributes['location'] = "group:#{projpath}"
+          end
+        end
+      end.to_s
     end
-    
+
     def save_as(path)
       FileUtils.mkdir_p(path)
       File.open(File.join(path, 'contents.xcworkspacedata'), 'w') do |out|

metadata

@@ -1,68 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xcodeproj
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-10 00:00:00 +01:00
-default_executable: 
+date: 2011-11-10 00:00:00.000000000 Z
 dependencies: []
-
-description: Xcodeproj lets you create and modify Xcode projects from MacRuby. Script boring management tasks or build Xcode-friendly libraries. Also includes support for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
+description: Xcodeproj lets you create and modify Xcode projects from MacRuby. Script
+  boring management tasks or build Xcode-friendly libraries. Also includes support
+  for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
 email: eloy.de.enige@gmail.com
 executables: []
-
-extensions: []
-
+extensions:
+- ext/xcodeproj/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/xcodeproj/config.rb
 - lib/xcodeproj/inflector.rb
 - lib/xcodeproj/project.rb
 - lib/xcodeproj/workspace.rb
 - lib/xcodeproj.rb
+- ext/xcodeproj/extconf.rb
+- ext/xcodeproj/xcodeproj_ext.c
 - README.md
 - LICENSE
-has_rdoc: true
 homepage: https://github.com/cocoapods/xcodeproj
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
+- ext
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from MacRuby.
 test_files: []
-