ib 0.2.1 → 0.2.2

data/README.md

@@ -123,7 +123,7 @@ Here is [sample app](https://github.com/yury/ibsample)
 3. run `rake ib:open` to change story board
 4. run `rake` to run app in simulator
 
-**Note** : this app is build for iOS 6.0 beta 2
+**Note** : this app is build for iOS 6.0
 
 ## Contributing
 

data/ib.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = IB::VERSION
 
-  gem.add_dependency "xcodeproj", ">= 0.2.3"
-  gem.add_dependency "thor", "~> 0.15.4"
+  gem.add_dependency "xcodeproj", ">= 0.4.0"
+  gem.add_dependency "thor", ">= 0.15.4"
 
   gem.add_development_dependency "rspec", ">= 2.0"
 end

data/lib/ib/generator.rb

@@ -1,6 +1,6 @@
 class IB::Generator
-  def write src, dest
-    files = IB::Parser.new.find_all(src)
+  def write files, dest
+    files = IB::Parser.new.find_all(files)
 
     FileUtils.mkpath dest
 

data/lib/ib/parser.rb

@@ -7,9 +7,12 @@ class IB::Parser
   METHOD_DEF_REGEX = /^[ \t]+(def)[ \t](#{NAME_REGEX})([ \t(]+)?(#{NAME_REGEX})?([ \t)]*)(#.*)?$/
   ACTION_REGEX = Regexp.union METHOD_DEF_REGEX, METHOD_REF_REGEX
 
-  def find_all(dir)
+  def find_all(dir_or_files)
     all = {}
-    Dir.glob("#{dir}/**/*.rb") do |file|
+    files = dir_or_files
+    files = Dir.glob("#{dir_or_files}/**/*.rb").to_a if dir_or_files.class == String
+    
+    files.each do |file|
       if info = find(file)
         all[file] = info
       end

data/lib/ib/project.rb

@@ -1,45 +1,43 @@
 class IB::Project
   def write app_path = "app", resources_path = "resources", pods_headers_path = "vendor/Pods/Headers"
     project = Xcodeproj::Project.new
-    target = project.targets.new_static_library(:ios, 'ui')
+    target = project.new_target(:static_library, 'ib', :ios)
 
-    resources = project.groups.new('path' => resources_path, 'name' => 'Resources')
-    support   = project.groups.new('name' => 'Supporting Files', 'path' => 'ib.xcodeproj')
-    pods      = project.groups.new('name' => 'Pods')
+    resources = project.new_group("Resources")
+    resources.path = resources_path
 
-    IB::Generator.new.write(app_path, "ib.xcodeproj")
-    support.files.new 'path' => 'Stubs.h', 'sourceTree' => '<group>'
+    support   = project.new_group("Supporting Files")
+    support.path = "ib.xcodeproj"
 
-    path = Pathname.new("Stubs.m")
-    desc = Xcodeproj::Project::PBXNativeTarget::SourceFileDescription.new(path, nil, nil)
-    file = target.add_source_files([desc]).first
-    file.source_tree = '<group>'
-    support.files << file
+    pods      = project.new_group("Pods")
+    pods.path = pods_headers_path
+
+    IB::Generator.new.write(Motion::Project::App.config.files, "ib.xcodeproj")
+
+    support.new_file "ib.xcodeproj/Stubs.h"
+    file = support.new_file "ib.xcodeproj/Stubs.m"
+    target.add_file_references([ file ])
 
     resource_exts = %W{xcdatamodeld png jpg jpeg storyboard xib lproj}
     Dir.glob("#{resources_path}/**/*.{#{resource_exts.join(",")}}") do |file|
-      file = file.gsub(/^#{resources_path}\//, '')
       if file.end_with? ".xcdatamodeld"
-        obj = resources.groups.new('isa' => 'XCVersionGroup', 'path' => file, 'sourceTree' => '<group>', 'versionGroupType' => 'wrapper.xcdatamodel')
-        file = obj.files.new('path' => file.gsub(/xcdatamodeld$/, 'xcdatamodel'), 'sourceTree' => '<group>', 'lastKnownFileType' => 'wrapper.xcdatamodel')
-        obj.attributes['currentVersion'] = file.uuid
+        relative_file_path = file.split("/").last
+        obj = resources.new_xcdatamodel_group(relative_file_path)
+        internal_file = obj.files.first
+        internal_file.path = relative_file_path.gsub(/xcdatamodeld$/, 'xcdatamodel')
+        internal_file.source_tree = "<group>"
+        resources.children << obj
       else
-        resources.files.new('path' => file, 'sourceTree' => '<group>')
+        resources.new_file(file)
       end
     end
 
     Dir.glob("#{pods_headers_path}/**/*.h") do |file|
-      pods.files.new('path' => file)
+      pods.new_file(file)
     end
 
-    # Add Basic System Frameworks
-    # frameworks = ["UIKit", "QuartzCore", "CoreGraphics", "CoreData"]
-    # doesn't work with UIKit
-
-    frameworks = ["QuartzCore", "CoreGraphics", "CoreData"]
-    frameworks.each do |framework|
-      file = project.add_system_framework framework
-      target.frameworks_build_phases.first << file
+    %W{QuartzCore CoreGraphics CoreData}.each do |framework|
+      project.add_system_framework framework
     end
 
     project.save_as("ib.xcodeproj")

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/spec_helper.rb

@@ -5,6 +5,22 @@
 
 require 'ib'
 
+module Motion
+  class Config
+    def self.files
+      []
+    end
+  end
+
+  module Project
+    class App
+      def self.config
+        Motion::Config
+      end
+    end
+  end
+end
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.2.1
   prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Yury Korolev
@@ -10,56 +10,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    none: false
+  prerelease: false
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.4.0
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
-- !ruby/object:Gem::Dependency
+        version: 0.15.4
+    none: false
+  prerelease: false
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.15.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.15.4
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
+    none: false
+  type: :development
 description: Magic rubymotion ib outlets support
 email:
 - yury.korolev@gmail.com
@@ -101,23 +101,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -1617517942573083833
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -2351586432581253994
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -1617517942573083833
+      hash: -2351586432581253994
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24