ib 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e9c82fc607ab9a37e14ad18ebf69c2fecc0e256
-  data.tar.gz: 153e219a271e45ee4a78fe841c57b6bb82d62c0f
+  metadata.gz: 1eea4e011091e08436b55716cc61bb6f9bb6fa1b
+  data.tar.gz: 5295da9a7c934346ec69f3af30cfcab2fd81b70c
 SHA512:
-  metadata.gz: 84f6f138dc29230e26161f3ca09439fd6936520ceae59e8e672890db37415c18b50ed2d69dae2a5b47d6641ab71304e66d355da176e035d52835ebaf6ea6b58c
-  data.tar.gz: 323138c6ef452527eb72c2f7260f0e844f1b5953aed1da529f9a2d8e19e2916e7ff70e542721794ef13e7263a5835bcc4dd2a0f4d328ba08fcb58c62b9cf3f8f
+  metadata.gz: a1c760308f730307b0be44476244016190da663eacac8d5811cb64e351b7dc1ced20cfd85f86c3c2de7a54972548072eff7726cab9d0defe67b5bca5359cfbf6
+  data.tar.gz: 74d07a792b9a2ae8d3ea8a4e672604598048206c64e28112173e81c89fc2923c37ac63cc040dd1060a8be44212c70e63bfb54d223eb04970a1fb870868883841

data/.travis.yml

@@ -0,0 +1,7 @@
+# cite from https://github.com/CocoaPods/Xcodeproj/blob/master/.travis.yml
+language: objective-c
+env:
+  - RVM_RUBY_VERSION=ruby-1.9.3-p392 NOEXEC_DISABLE=1 CI=true RUBY_VERSION_SPECIFIC='sudo ln -s /usr/bin/llvm-gcc-4.2 /usr/bin/gcc-4.2 && curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem' SSL_CERT_FILE=/usr/local/share/cacert.pem
+before_install: source ~/.rvm/scripts/rvm && rvm use $RVM_RUBY_VERSION
+install: eval $RUBY_VERSION_SPECIFIC && rake bootstrap[use_bundle_dir]
+script: bundle exec rake spec

data/README.md

@@ -3,6 +3,7 @@
 RubyMotion interface builder support (yes, with outlets)
 
 <a href='http://spellhub.com/projects/project/7'><img src="http://spellhub.com/projects/status/7" height="18"></a>
+[![Build Status](https://travis-ci.org/yury/ib.png)](https://travis-ci.org/yury/ib)
 
 [**Change Log**](https://github.com/yury/ib/wiki/Change-Log)
 

data/Rakefile

@@ -1,2 +1,30 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+# Travis support
+# cite from https://github.com/CocoaPods/Xcodeproj/blob/master/Rakefile
+def on_rvm?
+  `which ruby`.strip.include?('.rvm')
+end
+
+def rvm_ruby_dir
+  @rvm_ruby_dir ||= File.expand_path('../..', `which ruby`.strip)
+end
+
+desc 'Install dependencies'
+task :bootstrap, :use_bundle_dir? do |t, args|
+  options = []
+  options << "--without=documentation"
+  options << "--path ./travis_bundle_dir" if args[:use_bundle_dir?]
+  sh "bundle install #{options * ' '}"
+end
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rspec_opts = ['-cfs']
+  end
+rescue LoadError => e
+end

data/lib/ib/dependency_resolver.rb

@@ -0,0 +1,83 @@
+require 'tsort'
+
+module IB
+  class DependencyResolver
+
+    class TSortHash < ::Hash
+      include TSort
+
+      alias tsort_each_node each_key
+
+      def tsort_each_child(node, &block)
+        fetch(node).each(&block)
+      end
+    end
+
+    attr_reader :class_nodes, :files
+
+    def initialize(files)
+      @files = files
+      @class_nodes = struct_class_node
+    end
+
+    def sort_classes
+      @class_nodes.tsort
+    end
+
+    def sort_files
+      sort_classes.map do |klass|
+        files.select do |file, class_definitions|
+          has_class_in_file?(klass, class_definitions)
+        end.first
+      end.map do |file, _|
+        file
+      end.uniq.compact
+    end
+
+    def sort
+      sorted_files = {}
+      sort_files.each do |file|
+        sorted_files.store(file, @files[file])
+      end
+      sorted_files
+    end
+
+    private
+    def has_class_in_file?(klass, class_definitions)
+      !class_definitions.select do |x|
+        x[:class][0][0] == klass
+      end.empty?
+    end
+
+    def has_super_class?(class_definition)
+      class_definition[:class][0].size == 2      
+    end
+
+    def struct_class_node
+      list_of_hash = @files.map do |file, class_definitions|
+        class_definitions.map do |class_definition| create_node(class_definition) end
+      end.flatten
+
+      list_of_hash.inject(TSortHash.new) do |sum, x|
+        sum.merge!(x)
+      end
+    end
+
+    def create_node(class_definition)
+      has_super_class?(class_definition) ?
+        node_with_super_class(class_definition):
+          node_without_super_class(class_definition)
+    end
+
+    def node_with_super_class(class_definition)
+      {
+        class_definition[:class][0][0] => [class_definition[:class][0][1]],
+        class_definition[:class][0][1] => [],
+      }
+    end
+
+    def node_without_super_class(class_definition)
+      { class_definition[:class][0][0] => [] }
+    end
+  end
+end

data/lib/ib/parser.rb

@@ -1,3 +1,5 @@
+require 'ib/dependency_resolver'
+
 class IB::Parser
   NAME_REGEX = /[a-zA-Z][_a-zA-Z0-9]*/
   CLASS_REGEX  = /^[ \t]*class[ \t]+(#{NAME_REGEX})([ \t]*<[ \t]*(#{NAME_REGEX}))?/
@@ -23,7 +25,8 @@ class IB::Parser
         all[file] = infos
       end
     end
-    all
+
+    IB::DependencyResolver.new(all).sort
   end
 
   def find(path)

data/lib/ib/project.rb

@@ -17,6 +17,12 @@ class IB::Project
     end
   end
 
+  def app_files
+    Motion::Project::App.config.files.select do |file|
+      file =~ /^(\.\/)?app\//
+    end
+  end
+
   def write
     ib_project = "ib.xcodeproj"
     project = Xcodeproj::Project.new(ib_project)
@@ -32,7 +38,7 @@ class IB::Project
     pods.path = pods_headers_path
 
     generator = IB::Generator.new(detect_platform)
-    generator.write(Motion::Project::App.config.files, ib_project)
+    generator.write(app_files, ib_project)
 
     support.new_file "ib.xcodeproj/Stubs.h"
     file = support.new_file "ib.xcodeproj/Stubs.m"

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = '0.3.5'
+  VERSION = '0.4.0'
 end

data/spec/fixtures/dependency_test/sub_class_1.rb

@@ -0,0 +1,2 @@
+class SubClass1 < SubClass2
+end

data/spec/fixtures/dependency_test/sub_class_2.rb

@@ -0,0 +1,2 @@
+class SubClass2 < SuperClass
+end

data/spec/fixtures/dependency_test/super_class.rb

@@ -0,0 +1,2 @@
+class SuperClass < UIViewController
+end

data/spec/lib/ib/dependency_resolver_spec.rb

@@ -0,0 +1,113 @@
+require 'spec_helper'
+require 'ib/dependency_resolver'
+
+describe IB::DependencyResolver do
+  context 'init with simple dependency' do
+    before do
+      @files = {
+        'aaa.rb' => [{
+            class: [['SubClass1', 'SubClass2']],
+          }],
+        'bbb.rb' => [{
+            class: [['SubClass2', 'SuperClass']],
+          }],
+        'ccc.rb' => [{
+            class: [['SuperClass', 'UIViewController']],
+          }],
+      }
+    end
+
+    describe 'new' do
+      it 'create a instance IB::DependencyResolver' do
+        resolver = IB::DependencyResolver.new(@files)
+        expect(
+          resolver.class_nodes.kind_of?(IB::DependencyResolver::TSortHash)
+        ).to be_true
+      end
+    end
+
+    describe 'sort_classes' do
+      it 'create a instance IB::DependencyResolver' do
+        resolver = IB::DependencyResolver.new(@files)
+        expect(
+          resolver.sort_classes
+        ).to eq(['UIViewController', 'SuperClass', 'SubClass2', 'SubClass1'])
+      end
+    end
+
+    describe 'sort_files' do
+      it 'create a instance IB::DependencyResolver' do
+        resolver = IB::DependencyResolver.new(@files)
+        expect(
+          resolver.sort_files
+        ).to eq(['ccc.rb', 'bbb.rb', 'aaa.rb'])
+      end
+    end
+  end
+
+  context 'init with no dependencies' do
+    before do
+      @files = {
+        'aaa.rb' => [{
+            class: [['SubClass1']],
+          }],
+        'bbb.rb' => [{
+            class: [['SubClass2']],
+          }],
+        'ccc.rb' => [{
+            class: [['SuperClass']],
+          }],
+      }
+    end
+
+    describe 'sort_classes' do
+      it 'create a instance IB::DependencyResolver' do
+        resolver = IB::DependencyResolver.new(@files)
+        expect(
+          resolver.sort_classes
+        ).to eq(['SubClass1', 'SubClass2', 'SuperClass'])
+      end
+    end
+
+    describe 'sort_files' do
+      it 'create a instance IB::DependencyResolver' do
+        resolver = IB::DependencyResolver.new(@files)
+        expect(
+          resolver.sort_files
+        ).to eq(['aaa.rb', 'bbb.rb', 'ccc.rb'])
+      end
+    end
+  end
+
+  context 'init with dependency in one file' do
+    before do
+      @files = {
+        'aaa.rb' => [{
+            class: [['SubClass1', 'SubClass2']],
+          },{
+            class: [['SubClass2', 'SuperClass']],
+          },{
+            class: [['SuperClass']],
+          }]
+      }
+    end
+
+    describe 'sort_classes' do
+      it 'create a instance IB::DependencyResolver' do
+        resolver = IB::DependencyResolver.new(@files)
+        expect(
+          resolver.sort_classes
+        ).to eq(['SuperClass', 'SubClass2', 'SubClass1'])
+      end
+    end
+
+    describe 'sort_files' do
+      it 'create a instance IB::DependencyResolver' do
+        resolver = IB::DependencyResolver.new(@files)
+        expect(
+          resolver.sort_files
+        ).to eq(['aaa.rb'])
+      end
+    end
+  end
+end

data/spec/{generator_spec.rb → lib/ib/generator_spec.rb}

@@ -4,7 +4,7 @@ require "ib/generator"
 
 describe IB::Generator do
   it "generates stubs header with ios platform" do
-    files = IB::Parser.new.find_all("spec/fixtures")
+    files = IB::Parser.new.find_all("spec/fixtures/common")
     stubs = IB::Generator.new(:ios).render_stub_file('generator/templates/Stubs.h.erb', files)
 
     stubs.should == <<-OBJC
@@ -54,7 +54,7 @@ OBJC
   end
 
   it "generates stubs header with osx platform" do
-    files = IB::Parser.new.find_all("spec/fixtures")
+    files = IB::Parser.new.find_all("spec/fixtures/common")
     stubs = IB::Generator.new(:osx).render_stub_file('generator/templates/Stubs.h.erb', files)
 
     stubs.should == <<-OBJC
@@ -104,7 +104,8 @@ OBJC
   end
 
   it "generates stubs implement" do
-    files = IB::Parser.new.find_all("spec/fixtures")
+    files = IB::Parser.new.find_all("spec/fixtures/common")
+
     stubs = IB::Generator.new(:ios).render_stub_file('generator/templates/Stubs.m.erb', files)
 
     stubs.should == <<-OBJC

data/spec/{parser_spec.rb → 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/custom_view.rb").first
+    info = IB::Parser.new.find("spec/fixtures/common/custom_view.rb").first
     info[:class].should == [["CustomView", "UIView"]]
     info[:outlets].should == [
       ["greenLabel",    "UIGreenLabel"],
@@ -30,10 +30,16 @@ describe IB::Parser do
   end
 
   it "detects simple classes" do
-    IB::Parser.new.find("spec/fixtures/simple_class.rb").length.should == 0
+    IB::Parser.new.find("spec/fixtures/common/simple_class.rb").length.should == 0
   end
 
   it "finds all infos" do
-    puts IB::Parser.new.find_all("spec/fixtures").inspect
+    infos = IB::Parser.new.find_all("spec/fixtures/dependency_test")
+    expect(infos.size).to eq 3
+  end
+
+  it "finds all sorted infos" do
+    infos = IB::Parser.new.find_all("spec/fixtures/dependency_test")
+    expect(infos.size).to eq 3
   end
 end

data/spec/lib/ib/project_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+require "ib/project"
+
+describe IB::Project do
+  it "generates xcode project" do
+    IB::Project.new(app_path:"spec/fixtures/common").write()
+  end
+
+  it "app_files" do
+    Motion::Project::App.config.stub('files').and_return(
+      [
+        '/usr/local/xxx/gems/xxx/lib/xxxx.rb',
+        'User/xxx/gems/xxx/lib/motion/xxxx.rb',
+        './app/aaa.rb',
+        './app/controllers/bbb.rb',
+      ]
+    )
+    expect(IB::Project.new(app_path:"spec/fixtures/common").app_files).to eq(
+      ['./app/aaa.rb', './app/controllers/bbb.rb',]
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Yury Korolev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -92,6 +92,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -99,6 +100,7 @@ files:
 - bin/ib
 - ib.gemspec
 - lib/ib.rb
+- lib/ib/dependency_resolver.rb
 - lib/ib/generator.rb
 - lib/ib/generator/rendering_helper.rb
 - lib/ib/generator/templates/Stubs.h.erb
@@ -108,13 +110,17 @@ files:
 - lib/ib/project.rb
 - lib/ib/tasks.rb
 - lib/ib/version.rb
-- spec/fixtures/app_delegate.rb
-- spec/fixtures/custom_view.rb
-- spec/fixtures/empty_view.rb
-- spec/fixtures/simple_class.rb
-- spec/generator_spec.rb
-- spec/parser_spec.rb
-- spec/project_spec.rb
+- spec/fixtures/common/app_delegate.rb
+- spec/fixtures/common/custom_view.rb
+- spec/fixtures/common/empty_view.rb
+- spec/fixtures/common/simple_class.rb
+- spec/fixtures/dependency_test/sub_class_1.rb
+- spec/fixtures/dependency_test/sub_class_2.rb
+- spec/fixtures/dependency_test/super_class.rb
+- spec/lib/ib/dependency_resolver_spec.rb
+- spec/lib/ib/generator_spec.rb
+- spec/lib/ib/parser_spec.rb
+- spec/lib/ib/project_spec.rb
 - spec/spec_helper.rb
 - template/controller.erb
 - template/controller_helper.erb
@@ -143,11 +149,15 @@ signing_key:
 specification_version: 4
 summary: Small portion of love to interface builder with rubymotion
 test_files:
-- spec/fixtures/app_delegate.rb
-- spec/fixtures/custom_view.rb
-- spec/fixtures/empty_view.rb
-- spec/fixtures/simple_class.rb
-- spec/generator_spec.rb
-- spec/parser_spec.rb
-- spec/project_spec.rb
+- spec/fixtures/common/app_delegate.rb
+- spec/fixtures/common/custom_view.rb
+- spec/fixtures/common/empty_view.rb
+- spec/fixtures/common/simple_class.rb
+- spec/fixtures/dependency_test/sub_class_1.rb
+- spec/fixtures/dependency_test/sub_class_2.rb
+- spec/fixtures/dependency_test/super_class.rb
+- spec/lib/ib/dependency_resolver_spec.rb
+- spec/lib/ib/generator_spec.rb
+- spec/lib/ib/parser_spec.rb
+- spec/lib/ib/project_spec.rb
 - spec/spec_helper.rb

data/spec/project_spec.rb

@@ -1,9 +0,0 @@
-require "spec_helper"
-
-require "ib/project"
-
-describe IB::Project do
-  it "generates xcode project" do
-    IB::Project.new(app_path:"spec/fixtures").write()
-  end
-end