ib 0.0.3 → 0.0.4

data/README.md

@@ -19,9 +19,9 @@ Or install it yourself as:
 In your Rake file:
 
 ```ruby
-# -*- coding: utf-8 -*-
-$:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+
+$:.unshift("/Library/RubyMotion/lib")  
+require 'motion/project'  
 
 # if you use bundler
 require 'bundler' 
@@ -39,26 +39,37 @@ end
 
 ## Usage
 
-Extend your controllers with IB module:
+Generate controller with folllowing command:
 
-```ruby
-class SuperController < UIViewController
+```
+ib c Hello UIViewController \
+  --outlets scroller:UIScrollView btn_hello:UIButton \
+  --actions say_hello \
+  --accessors data_source
+```
 
+The generated file:
+
+#### /app/controllers/hello_controller.rb
+```ruby
+class HelloController < UIViewController
   extend IB
 
-  # define attribute accessor
-  attr_accessor title
+  ## define accessors
+  attr_accessor :data_source, :scroller, :htn_hello
 
-  # define ib outlet
-  ib_outlet :title, UILabel
+  ## define ib outlets
+  ib_outlet :scroller, UIScrollView
+  ib_outlet :btn_hello, UIButton
 
-  # define action method
-  def ontouch button
-    title.text = "Touched!!!"
+  ## define actions
+  def say_hello(sender)
+    # TODO Implement action here
   end
 
-  # define ib action 
-  ib_action :ontouch
+  ## define ib action 
+  ib_action :say_hello
+
 end
 ```
 

data/bin/ib

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+require "rubygems"
+
+require "thor"
+require "thor/group"
+require 'thor/rake_compat'
+
+module IB
+  class ControllerGenerator < Thor
+    include Thor::Actions
+    include Thor::RakeCompat
+    
+    map "c" => :controller
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    desc "controller", "generate controller"
+    argument :name, :type => :string, :desc => "Name of the controller"
+    argument :controller_type, :type => :string, :desc => "Type of the controller, default: UIViewController", :default => "UIViewController"
+    class_option :outlets, :type => :hash, :default => {}, :required => false, :desc => "IBOutlets of the controller"
+    class_option :actions, :type => :array, :default => [], :required => false, :desc => "IBAtions of the controller"
+    class_option :accessors, :type => :array, :default => [], :required => false, :desc => "Accessors of the controller"
+    def controller
+      create_controller_file
+      create_helper_file
+      create_spec_file
+    end
+
+    private
+    def create_controller_file
+      template('../template/controller.erb', "app/controllers/#{underscore(name)}_controller.rb")
+    end
+
+    def create_helper_file
+      template('../template/controller_helper.erb', "app/helpers/#{underscore(name)}_helper.rb")
+    end
+
+    def create_spec_file
+      template('../template/controller_spec.erb', "spec/controllers/#{underscore(name)}_controller_spec.rb")
+    end
+
+    def controller_name
+      camelize("#{name}Controller")
+    end
+
+    def underscore(string)
+      string.gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+    end
+
+    def camelize(string)
+      return string if string !~ /_/ && string =~ /[A-Z]+.*/
+      string.split('_').map{|e| e.capitalize }.join
+    end
+  end
+end
+
+IB::ControllerGenerator.start

data/ib.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/ib/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Yury Korolev"]
-  gem.email         = ["yury.korolev@gmail.com"]
+  gem.authors       = ["Yury Korolev", "Francis Chong"]
+  gem.email         = ["yury.korolev@gmail.com", "francis@ignition.hk"]
   gem.description   = %q{Stupid rubymotion ib outlets support}
   gem.summary       = %q{Small portion of love to interface builder with rubymotion}
   gem.homepage      = ""
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = IB::VERSION
 
   gem.add_dependency "xcodeproj", ">= 0.2.3"
+  gem.add_dependency "thor", "~> 0.15.4"
 
   gem.add_development_dependency "rspec", ">= 2.0"
 end

data/lib/ib/project.rb

@@ -1,17 +1,35 @@
 class IB::Project
-  def write app_path = "./app", resources_path = "./resources"
+  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')
-    stubs = IB::Generator.new.write(app_path, "ui.xcodeproj")
-    stubs_path = Pathname.new("ui.xcodeproj/stubs.h")
-    files = [Xcodeproj::Project::PBXNativeTarget::SourceFileDescription.new(stubs_path, nil, nil)]
-    
 
-    Dir.glob("#{resources_path}/**/*.{xcdatamodeld,png,jpg,jpeg,storyboard,xib}") do |file|
-      files << Xcodeproj::Project::PBXNativeTarget::SourceFileDescription.new(Pathname.new(file), nil, nil)
+    resources = project.groups.new('path' => resources_path, 'name' => 'Resources')
+    support   = project.groups.new('name' => 'Supporting Files')
+    pods      = project.groups.new('name' => 'Pods')
+
+    stubs_path = "ui.xcodeproj/stubs.h"
+    IB::Generator.new.write(app_path, "ui.xcodeproj")
+    support.files.new 'path' => stubs_path
+
+    resource_exts = %W{xcdatamodeld png jpg jpeg storyboard xib lproj}
+    Dir.glob("#{resources_path}/**/*.{#{resource_exts.join(",")}}") do |file|
+      resources.files.new('path' => file)
+    end
+
+    Dir.glob("#{pods_headers_path}/**/*.h") do |file|
+      pods.files.new('path' => 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
     end
 
-    target.add_source_files(files)
 
     project.save_as("ui.xcodeproj")
   end

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/template/controller.erb

@@ -0,0 +1,24 @@
+class <%= controller_name %> < <%= controller_type %>
+  extend IB
+
+  ## define accessors
+  attr_accessor <%= (options[:accessors] + options[:outlets].keys).collect{|acc| ":#{acc}"}.join(", ") %>
+
+  ## define ib outlets
+<% options[:outlets].each do |name, type| -%>
+  ib_outlet :<%= name %>, <%= type %>
+<% end -%>
+
+  ## define actions
+<% options[:actions].each do |action| -%>
+  def <%= action %>(sender)
+    # TODO Implement action here
+  end
+<% end -%>
+
+  ## define ib action 
+<% options[:actions].each do |action| -%>
+  ib_action :<%= action %>
+<% end -%>
+
+end

data/template/controller_helper.erb

@@ -0,0 +1,2 @@
+module <%= camelize("#{name}Helper") %>
+end

data/template/controller_spec.erb

@@ -0,0 +1,8 @@
+describe "<%= controller_name %>" do
+  tests <%= controller_name %>
+
+<% options[:actions].each do |action| -%>
+  describe "#<%= action %>" do
+  end
+<% end -%>
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
 - Yury Korolev
+- Francis Chong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -27,6 +28,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
+- !ruby/object:Gem::Dependency
+  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
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -46,7 +63,9 @@ dependencies:
 description: Stupid rubymotion ib outlets support
 email:
 - yury.korolev@gmail.com
-executables: []
+- francis@ignition.hk
+executables:
+- ib
 extensions: []
 extra_rdoc_files: []
 files:
@@ -56,6 +75,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/ib
 - ib.gemspec
 - lib/ib.rb
 - lib/ib/generator.rb
@@ -71,6 +91,9 @@ files:
 - spec/parser_spec.rb
 - spec/project_spec.rb
 - spec/spec_helper.rb
+- template/controller.erb
+- template/controller_helper.erb
+- template/controller_spec.erb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -85,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3342148474886452846
+      hash: -3368252777998978159
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3342148474886452846
+      hash: -3368252777998978159
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24