ib 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9877eb0ab9be9bf201b6f9dbe23416c7f5b5439
-  data.tar.gz: 5e6aab594f8197db1be1da81d80dcfee9104fbe7
+  metadata.gz: 0ea52248a4f7ff0413027ee553fdb45c6f3cd95d
+  data.tar.gz: 85d3e69c6f1b9ab25a904637a6a3c40d7de8295d
 SHA512:
-  metadata.gz: 8876b001e5e7a8bc17fb19a5c84bd4d721c9e44d4f3ceb3540f7e7f78e149156499460c878eb550ab65d7d2b40b209b669e43e8a9891f62b419069a9815134b6
-  data.tar.gz: 32f58ddd91216fc1cf44af708597bc411356ab438f4199662d0d23d509fb4cf4b6a306bfdfeaa3375144747e4f9e9a07dfdbb2dcc76bd17e1f92c05121e89f7e
+  metadata.gz: fc0952cdb7beb7a43a589d3cb8bffc9530906744c010227c00de41914ce63f4dbfae123d7297cf0746f80159782875ca3811a27862b0dbaa9f7893856df4335e
+  data.tar.gz: 89e8ee5db2a7257cbe33726634fc5b4a83cf7c24f0c77075241f5ec51cfc269d240ab29e927d9a845bad67b183b018d57acaa3dcf5f03aecb7fd26a025f80d1b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ib (0.4.7)
+    ib (0.7.0)
       thor (~> 0.15.4)
       tilt (~> 1.4.1)
       xcodeproj (~> 0.17)
@@ -9,9 +9,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.17)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.1.8)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     coderay (1.1.0)
     colored (1.2)
     diff-lcs (1.2.5)
@@ -29,14 +32,15 @@ GEM
     guard-rspec (3.1.0)
       guard (>= 1.8)
       rspec (~> 2.13)
-    i18n (0.6.9)
+    i18n (0.6.11)
+    json (1.8.1)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     lumberjack (1.0.5)
     method_source (0.8.2)
-    multi_json (1.9.2)
+    minitest (5.4.3)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -57,9 +61,12 @@ GEM
     rspec-mocks (2.14.6)
     slop (3.5.0)
     thor (0.15.4)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    xcodeproj (0.17.0)
-      activesupport (~> 3.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xcodeproj (0.20.2)
+      activesupport (>= 3)
       colored (~> 1.2)
 
 PLATFORMS

data/README.md

@@ -38,6 +38,10 @@ Bundler.require
 require 'rubygems'
 require 'ib'
 
+IB::RakeTask.new do |project|
+  # ...
+end
+
 Motion::Project::App.setup do |app|
   # ...
 end

data/lib/ib/generator.rb

@@ -20,7 +20,7 @@ class IB::Generator
   end
 
   def write files, dest
-    files = IB::Parser.new.find_all(files)
+    files = IB::Parser.new(@build_platform).find_all(files)
 
     FileUtils.mkpath dest
 

data/lib/ib/oc_interface.rb

@@ -25,6 +25,7 @@ class IB::OCInterface
     @outlet_collections = create_instances(OutletCollection, params[:outlet_collections])
     @actions            = create_instances(Action, params[:actions])
     @path               = params[:path]
+    @build_platform     = params[:build_platform]
   end
 
   def [](key)
@@ -34,8 +35,8 @@ class IB::OCInterface
   def super_class
     # for support `ProMotion` gem https://github.com/yury/ib/pull/45
     return 'UIViewController' if @super_class =~ /^(?:PM::|ProMotion::)/
-    delegate_class = App.template == :ios ? 'UIApplicationDelegate' : 'NSApplicationDelegate'
-    responder_class = App.template == :ios ? 'UIResponder' : 'NSObject'
+    delegate_class = @build_platform == :ios ? 'UIApplicationDelegate' : 'NSApplicationDelegate'
+    responder_class = @build_platform == :ios ? 'UIResponder' : 'NSObject'
     @super_class ||
       ((@sub_class == 'AppDelegate') ? "#{responder_class} <#{delegate_class}>" : 'NSObject')
   end

data/lib/ib/parser.rb

@@ -13,6 +13,12 @@ class IB::Parser
   METHOD_DEF_REGEX = /^[ \t]+(def)[ \t]#{METHOD_ARGUMENT_REGEX}([ \t(]+)?#{METHOD_ARGUMENT_REGEX}?([ \t)]*)(#.*)?$/
   ACTION_REGEX = Regexp.union METHOD_DEF_REGEX, METHOD_REF_REGEX
 
+  def initialize(motion_template_type)
+    # NOTE: motion_template_type equal to Motion::Project::App.template
+    #       but, this class use its value for judging build platform.
+    @build_platform = motion_template_type
+  end
+
   def find_all(dir_or_files)
     all = {}
     files = case dir_or_files
@@ -53,6 +59,7 @@ class IB::Parser
       info[:actions] = find_actions(s)
 
       info[:path] = path
+      info[:build_platform] = @build_platform
 
       infos << IB::OCInterface.new(info)
     end

data/lib/ib/project.rb

@@ -2,6 +2,8 @@
 class IB::Project
   attr_accessor :platform
   attr_accessor :project_path
+  attr_accessor :app_files
+  attr_accessor :resource_directories
 
   IB_PROJECT_NAME     = 'ib.xcodeproj'
   DEFAULT_FRAMEWORKS  = %W{QuartzCore CoreGraphics CoreData}
@@ -9,9 +11,28 @@ class IB::Project
     xcdatamodeld png jpg jpeg storyboard xib lproj ttf otf
   }
 
-  def initialize options={}
-    @platform        = options[:platform]     || detect_platform
-    @project_path    = options[:project_path] || Dir.pwd
+  def initialize(options={})
+    @platform     = options[:platform]
+    @project_path = options[:project_path] || Dir.pwd
+  end
+
+  def motion_config
+    Motion::Project::App.config
+  end
+  private :motion_config
+
+  def platform
+    @platform ||= motion_config.deploy_platform == 'MacOSX' ? :osx : :ios
+  end
+
+  def app_files
+    @app_files ||= motion_config.files.select do |file|
+      file =~ /^(\.\/)?app\//
+    end
+  end
+
+  def resource_directories
+    @resource_directories ||= motion_config.resources_dirs
   end
 
   # Writes a new ib.xcodeproj to the provided `#project_path`.
@@ -44,7 +65,7 @@ class IB::Project
   end
 
   def generator
-    @generator ||= IB::Generator.new(detect_platform)
+    @generator ||= IB::Generator.new(platform)
   end
 
   def resources
@@ -59,24 +80,7 @@ class IB::Project
     @pods ||= project.new_group("Pods")
   end
 
-  def detect_platform
-    # TODO: find a better way to detect platform
-    if defined?(Motion::Project::Config)
-      if Motion::Project::App.config.respond_to?(:platforms)
-        return Motion::Project::App.config.platforms[0] == 'MacOSX' ? :osx : :ios
-      end
-    end
-    return :ios
-  end
-
-  def app_files
-    Motion::Project::App.config.files.select do |file|
-      file =~ /^(\.\/)?app\//
-    end
-  end
-
   def setup_paths
-    resources.path     = File.join(project_path, 'resources')
     support_files.path = File.join(project_path, IB_PROJECT_NAME)
     pods.path          = File.join(project_path, 'vendor/Pods/Headers')
   end
@@ -90,14 +94,17 @@ class IB::Project
   end
 
   def add_resources
-    # First add reference to any asset catalogs.
-    Dir.glob("#{resources.path}/**/*.xcassets") do |file|
-      resources.new_reference(file)
-    end
-    # Add all other resources, ignoring files in existing asset catalogs
-    Dir["#{resources.path}/**/*.{#{RESOURCE_EXTENSIONS.join(",")}}"]
-      .reject {|f| f[%r{.*\.xcassets/.*}] }.each do |file|
-      resources.new_reference(file)
+    resource_directories.each do |dir|
+      group = resources.new_group(File.basename(dir), dir)
+      # First add reference to any asset catalogs.
+      Dir.glob(File.join(dir, "**/*.xcassets")) do |file|
+        group.new_reference(File.basename(file))
+      end
+      # Add all other resources, ignoring files in existing asset catalogs
+      Dir.glob(File.join(dir, "**/*.{#{RESOURCE_EXTENSIONS.join(",")}}"))
+        .reject {|f| f[%r{.*\.xcassets/.*}] }.each do |file|
+        group.new_reference(File.basename(file))
+      end
     end
   end
 

data/lib/ib/tasks.rb

@@ -1,15 +1,31 @@
 # -*- encoding : utf-8 -*-
 require 'rake' unless defined? Rake
 
-namespace :ib do
-  desc "Generates ib.xcodeproj and opens it in XCode"
-  task :open => :project do
-    system "open ib.xcodeproj"
-  end
+module IB
+  class RakeTask
+    include Rake::DSL
+
+    def initialize
+      require 'ib/project'
+      @project = IB::Project.new
+      yield @project if block_given?
+      define_tasks
+    end
+
+    def define_tasks
+      namespace :ib do
+        desc "Generates ib.xcodeproj"
+        task :project do
+          @project.write
+        end
 
-  desc "Generates ib.xcodeproj"
-  task :project do
-    IB::Project.new.write
+        desc "Generates ib.xcodeproj and opens it in XCode"
+        task :open => :project do
+          system "open ib.xcodeproj"
+        end
+      end
+      desc "Same as 'ib:open'"
+      task :ib => "ib:open"
+    end
   end
 end
-task :ib => "ib:open"

data/lib/ib/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module IB
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/lib/ib/generator_spec.rb

@@ -4,7 +4,7 @@ require "ib/generator"
 
 describe IB::Generator do
   describe "generates stubs header with ios platform" do
-    files = IB::Parser.new.find_all("spec/fixtures/common")
+    files = IB::Parser.new(:ios).find_all("spec/fixtures/common")
     stubs = IB::Generator.new(:ios).render_stub_file('generator/templates/Stubs.h.erb', files)
 
     it 'should output valid values from IB::Generator::RenderingHelpers and template file' do
@@ -65,7 +65,7 @@ OBJC
   end
 
   describe "generates stubs header with osx platform" do
-    files = IB::Parser.new.find_all("spec/fixtures/common")
+    files = IB::Parser.new(:osx).find_all("spec/fixtures/common")
     stubs = IB::Generator.new(:osx).render_stub_file('generator/templates/Stubs.h.erb', files)
 
     it 'should output valid values from IB::Generator::RenderingHelpers and template file' do
@@ -77,7 +77,7 @@ OBJC
 #import <CoreData/CoreData.h>
 #import <Cocoa/Cocoa.h>
 
-@interface AppDelegate: UIResponder <UIApplicationDelegate>
+@interface AppDelegate: NSObject <NSApplicationDelegate>
 
 @property IBOutlet UIWindow * window;
 @property IBOutlet UINavigationController * navigationController;
@@ -126,7 +126,7 @@ OBJC
   end
 
   describe "generates stubs implement" do
-    files = IB::Parser.new.find_all("spec/fixtures/common")
+    files = IB::Parser.new(:ios).find_all("spec/fixtures/common")
     stubs = IB::Generator.new(:ios).render_stub_file('generator/templates/Stubs.m.erb', files)
 
     it 'should output valid values from IB::Generator::RenderingHelpers and template file' do
@@ -163,7 +163,7 @@ OBJC
 
   describe "generates stubs header with ios platform of dependency_test fixtures" do
     it 'should output definitions which sorterd by its own dependencies' do
-      files = IB::Parser.new.find_all("spec/fixtures/dependency_test")
+      files = IB::Parser.new(:ios).find_all("spec/fixtures/dependency_test")
       stubs = IB::Generator.new(:ios).render_stub_file('generator/templates/Stubs.h.erb', files)
 
       stubs.should == <<-OBJC
@@ -212,7 +212,7 @@ OBJC
 
   describe "generates stubs header with ios platform of ProMotion's fixtures" do
     it 'should replace super_class from PM::* or ProMotion::* to UIViewController' do
-      files = IB::Parser.new.find_all("spec/fixtures/for_promotion")
+      files = IB::Parser.new(:ios).find_all("spec/fixtures/for_promotion")
       stubs = IB::Generator.new(:ios).render_stub_file('generator/templates/Stubs.h.erb', files)
 
       stubs.should == <<-OBJC

data/spec/lib/ib/parser_spec.rb

@@ -4,7 +4,7 @@ require "ib/parser"
 
 describe IB::Parser do
   it "finds outlets and actions" do
-    info = IB::Parser.new.find("spec/fixtures/common/custom_view.rb").first
+    info = IB::Parser.new(:ios).find("spec/fixtures/common/custom_view.rb").first
     info[:class].should == [["CustomView", "UIView"]]
     info[:outlets].should == [
       ["greenLabel",    "UIGreenLabel"],
@@ -30,17 +30,17 @@ describe IB::Parser do
   end
 
   it "can parse complex superclasses" do
-    info = IB::Parser.new.find("spec/fixtures/common/complex_superclass.rb")
+    info = IB::Parser.new(:ios).find("spec/fixtures/common/complex_superclass.rb")
     info.first[:class].should == [["HasComplexSuperClass", "Complex::SuperClass"]]
     info.last[:class].should == [["HasLessComplexSuperClass", "PM::Screen"]]
   end
 
   it "can output simple classes" do
-    IB::Parser.new.find("spec/fixtures/common/simple_class.rb").length.should == 1
+    IB::Parser.new(:ios).find("spec/fixtures/common/simple_class.rb").length.should == 1
   end
 
   it "finds all infos" do
-    infos = IB::Parser.new.find_all("spec/fixtures/dependency_test")
+    infos = IB::Parser.new(:ios).find_all("spec/fixtures/dependency_test")
     infos.values.each do |vals|
       vals.each do |v|
         expect(v).to be_kind_of(IB::OCInterface)

data/spec/lib/ib/project_spec.rb

@@ -3,6 +3,9 @@ require "spec_helper"
 require "ib/project"
 
 describe IB::Project do
+  after do
+    Motion::Project::App.config = nil
+  end
 
   context 'structure' do
     let(:project) { described_class.new(project_path: 'spec/fixtures/common')}
@@ -35,10 +38,6 @@ describe IB::Project do
     it "defines #pods" do
       expect(project).to respond_to :pods
     end
-
-    it "defines #detect_platform" do
-      expect(project).to respond_to :detect_platform
-    end
   end
 
   describe '#initialize' do
@@ -82,12 +81,36 @@ describe IB::Project do
       expect(project.platform).to eq :ios
     end
 
+    it 'defaults to the application platform' do
+      Motion::Project::App.config = Motion::Project::Config.new(:ios)
+      project = described_class.new
+      expect(project.platform).to eq :ios
+      Motion::Project::App.config = Motion::Project::Config.new(:osx)
+      project = described_class.new
+      expect(project.platform).to eq :osx
+    end
+
     it 'can be set from parameter' do
       project = described_class.new platform: :osx
       expect(project.platform).to eq :osx
     end
   end
 
+  describe '#resource_directories' do
+    it 'defaults to "resources"' do
+      project = described_class.new
+      expect(project.resource_directories).to eq ['resources']
+    end
+
+    it 'defaults to the application directories' do
+      config = Motion::Project::Config.new
+      config.resources_dirs << 'other_resources'
+      Motion::Project::App.config = config
+      project = described_class.new
+      expect(project.resource_directories).to eq ['resources', 'other_resources']
+    end
+  end
+
   describe '#app_files' do
     before do
       Motion::Project::App.config.stub('files').and_return(

data/spec/spec_helper.rb

@@ -6,16 +6,29 @@
 require 'ib'
 
 module Motion
-  class Config
-    def self.files
-      []
+  module Project
+    class Config
+      attr_reader :files
+      attr_reader :resources_dirs
+
+      def initialize(platform = :ios)
+        @platform = platform
+        @files = []
+        @resources_dirs = ['resources']
+      end
+
+      def deploy_platform
+        @platform == :ios ? 'iPhoneOS' : 'MacOSX'
+      end
     end
-  end
 
-  module Project
     class App
-      def self.config
-        Motion::Config
+      class << self
+        attr_writer :config
+
+        def config
+          @config ||= Config.new
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Yury Korolev
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Magic rubymotion ib outlets support
@@ -118,9 +118,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -174,17 +174,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Small portion of love to interface builder with rubymotion