dynamics 0.0.8 → 0.0.9

data/base/Rakefile

@@ -5,37 +5,12 @@ $LOAD_PATH.unshift('/Library/RubyMotion/lib')
 require 'motion/project'
 require 'rubygems'
 require 'bubble-wrap'
-
-def render_code(name)
-    f = File.open(name)     
-    content = f.read
-    f.close
-    content
-end
+require 'dynamics'
 
 Motion::Project::App.setup do |app|
   app.name = ''  
   app.delegate_class = ''  
   
-  # Copy gem library to tmp location
-  tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
-  f = File.new(File.join(tmp_dir, 'dynamics.rb'), 'w+')   
-  f.write(render_code(File.join(Gem.bin_path('dynamics', 'dynamics').gsub(File.join('bin', 'dynamics'), ''), 'lib', 'dynamics.rb'))) 
-  f.close
-    
-  # Parse layouts
-  layouts_dir = File.join(File.dirname(__FILE__), 'templates', 'layouts')  
-  lib_code = render_code(File.join(tmp_dir, 'dynamics.rb'))
-  new_code = lib_code
-  lib_code.scan(/# \@layouts\/[a-z_]+\@/) do |layout|
-    layout_file = '_' + layout.split('/')[1].chomp('@') + '.rb'
-    layout_code = render_code(File.join(layouts_dir, layout_file))
-    new_code = new_code.gsub(layout, layout_code)
-  end
-  f = File.open(File.join(tmp_dir, 'dynamics.rb'), 'w+')   
-  f.write(new_code) 
-  f.close
-  
-  app.files.unshift(File.join(tmp_dir, 'dynamics.rb')) 
+  Dynamics::setup_framework(app, File.dirname(__FILE__))
 end
 

data/base/templates/dynamics.rb

@@ -0,0 +1,51 @@
+
+module Dynamics
+    
+  class Application
+    def initialize(layout)
+      @layout = layout
+    end
+    
+    def application(application, didFinishLaunchingWithOptions:launchOptions)
+      @window =  MainView.alloc.initWithFrame(UIScreen.mainScreen.bounds)  
+      @window.makeKeyAndVisible   
+      if @layout == 'Navigation'
+        # @@Navigation@@
+        # @@End@@
+                                
+        @window.rootViewController = UINavigationController.alloc.initWithRootViewController(controller)           
+      elsif @layout == 'Tab Bar'           
+        controller = MainController.alloc.initWithNibName(nil, bundle: nil)    
+        nav_controller = UINavigationController.alloc.initWithRootViewController(controller)
+
+        tab_controller = UITabBarController.alloc.initWithNibName(nil, bundle: nil)
+        tab_controller.viewControllers = [nav_controller]
+        
+        @window.rootViewController = tab_controller                       
+      else     
+        @window.rootViewController = MainController.alloc.initWithNibName(nil, bundle: nil)           
+      end  
+      true
+    end    
+  end
+  
+  class Controller < UIViewController   
+    attr_accessor :next_controller
+    
+    def on_next 
+      self.navigationController.pushViewController(@next_controller, animated: true)      
+    end
+       
+  private
+   
+    def viewDidLoad
+      super
+      
+      self.title = App.name
+      self.view.backgroundColor = UIColor.whiteColor  
+    end    
+  end
+  
+  class Window < UIWindow
+  end  
+end

data/bin/dynamics

@@ -1,84 +1,7 @@
 #!/usr/bin/env ruby
 
-def create_scaffold(name)
-  if File.exists?(name)    
-    puts "Error, #{name} already exists!"
-  else  
-    Dir.mkdir(name)
-    
-    # Base
-        
-    app_dir = File.join(name, 'app')    
-    build_dir = File.join(name, 'build')      
-    resources_dir = File.join(name, 'resources')   
-    templates_dir = File.join(name, 'templates')       
-    tmp_dir = File.join(name, 'tmp')   
-            
-    Dir.mkdir(app_dir) 
-    Dir.mkdir(build_dir)       
-    Dir.mkdir(resources_dir)   
-    Dir.mkdir(templates_dir)       
-    Dir.mkdir(tmp_dir)    
-    
-    base_dir = File.join(File.dirname(__FILE__), '..', 'base')
-    
-    f = File.new(File.join(name, 'Rakefile'), 'w+')   
-    code = render_code(File.join(base_dir, 'Rakefile'))
-    code.gsub!("app.name = ''", "app.name = '#{name}'")
-    code.gsub!("app.delegate_class = ''", "app.delegate_class = '#{name}'")    
-    f.write(code) 
-    f.close  
-    
-    f = File.new(File.join(app_dir, 'application.rb'), 'w+')   
-    code = render_code(File.join(base_dir, 'app', 'application.rb')) 
-    code.gsub!("class Application", "class #{name}")    
-    f.write(code) 
-    f.close
-        
-    # Controllers 
-    
-    controllers_dir = File.join(app_dir, 'controllers')    
-    Dir.mkdir(controllers_dir)    
-        
-    f = File.new(File.join(controllers_dir, 'main_controller.rb'), 'w+')   
-    f.write(render_code(File.join(base_dir, 'app', 'controllers', 'main_controller.rb'))) 
-    f.close    
-    
-    f = File.new(File.join(controllers_dir, 'sub1_controller.rb'), 'w+')   
-    f.write(render_code(File.join(base_dir, 'app', 'controllers', 'sub1_controller.rb'))) 
-    f.close
-    
-    f = File.new(File.join(controllers_dir, 'sub2_controller.rb'), 'w+')   
-    f.write(render_code(File.join(base_dir, 'app', 'controllers', 'sub2_controller.rb'))) 
-    f.close
-           
-    # Views
-                
-    views_dir = File.join(app_dir, 'views')  
-    Dir.mkdir(views_dir)
-                        
-    f = File.new(File.join(views_dir, 'main_view.rb'), 'w+')   
-    f.write(render_code(File.join(base_dir, 'app', 'views', 'main_view.rb'))) 
-    f.close
-        
-    f = File.new(File.join(views_dir, 'sub1_view.rb'), 'w+')   
-    f.write(render_code(File.join(base_dir, 'app', 'views', 'sub1_view.rb'))) 
-    f.close
-    
-    f = File.new(File.join(views_dir, 'sub2_view.rb'), 'w+')   
-    f.write(render_code(File.join(base_dir, 'app', 'views', 'sub2_view.rb'))) 
-    f.close
-                
-    # Layouts 
-
-    layouts_dir = File.join(templates_dir, 'layouts')  
-    Dir.mkdir(layouts_dir)
-        
-    f = File.new(File.join(templates_dir, 'layouts', '_navigation.rb'), 'w+')   
-    f.write(render_code(File.join(base_dir, 'templates', 'layouts', '_navigation.rb'))) 
-    f.close    
-  end
-end
+require 'rubygems'
+require 'dynamics'
 
 def display_usage
   str = "Dynamics is a framework for RubyMotion.\n"
@@ -92,13 +15,6 @@ def display_usage
   puts str
 end
 
-def render_code(name)
-    f = File.open(name)     
-    content = f.read
-    f.close
-    content
-end
-
 i = 1
 for arg in ARGV
   case i
@@ -110,7 +26,7 @@ for arg in ARGV
 end
 case command
    when '-h', '--help' then display_usage
-   when 'create' then create_scaffold(args)
+   when 'create' then Dynamics::create_scaffold(args, File.dirname(__FILE__))
    else  display_usage
 end  
 

data/lib/dynamics.rb

@@ -1,50 +1,120 @@
 
 module Dynamics
-    
-  class Application
-    def initialize(layout)
-      @layout = layout
+  
+  def self.create_scaffold(name, path)
+    if File.exists?(name)    
+      puts "Error, #{name} already exists!"
+    else  
+      Dir.mkdir(name)
+
+      # Base
+
+      app_dir = File.join(name, 'app')    
+      build_dir = File.join(name, 'build')      
+      resources_dir = File.join(name, 'resources')     
+      lib_dir = File.join(name, 'lib')   
+
+      Dir.mkdir(app_dir) 
+      Dir.mkdir(build_dir)       
+      Dir.mkdir(resources_dir)      
+      Dir.mkdir(lib_dir)    
+
+      base_dir = File.join(File.dirname(__FILE__), '..', 'base')
+
+      f = File.new(File.join(name, 'Rakefile'), 'w+')   
+      code = render_code(File.join(base_dir, 'Rakefile'))
+      code.gsub!("app.name = ''", "app.name = '#{name}'")
+      code.gsub!("app.delegate_class = ''", "app.delegate_class = '#{name}'")    
+      f.write(code) 
+      f.close  
+
+      # App
+
+      f = File.new(File.join(app_dir, 'application.rb'), 'w+')   
+      code = render_code(File.join(base_dir, 'app', 'application.rb')) 
+      code.gsub!("class Application", "class #{name}")    
+      f.write(code) 
+      f.close
+
+      # Controllers 
+
+      controllers_dir = File.join(app_dir, 'controllers')    
+      Dir.mkdir(controllers_dir)    
+
+      f = File.new(File.join(controllers_dir, 'main_controller.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'app', 'controllers', 'main_controller.rb'))) 
+      f.close    
+
+      f = File.new(File.join(controllers_dir, 'sub1_controller.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'app', 'controllers', 'sub1_controller.rb'))) 
+      f.close
+
+      f = File.new(File.join(controllers_dir, 'sub2_controller.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'app', 'controllers', 'sub2_controller.rb'))) 
+      f.close
+
+      # Views
+
+      views_dir = File.join(app_dir, 'views')  
+      Dir.mkdir(views_dir)
+
+      f = File.new(File.join(views_dir, 'main_view.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'app', 'views', 'main_view.rb'))) 
+      f.close
+
+      f = File.new(File.join(views_dir, 'sub1_view.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'app', 'views', 'sub1_view.rb'))) 
+      f.close
+
+      f = File.new(File.join(views_dir, 'sub2_view.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'app', 'views', 'sub2_view.rb'))) 
+      f.close
+
+      # Lib 
+
+      f = File.new(File.join(lib_dir, 'dynamics.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'templates', 'dynamics.rb')) ) 
+      f.close 
     end
-    
-    def application(application, didFinishLaunchingWithOptions:launchOptions)
-      @window =  MainView.alloc.initWithFrame(UIScreen.mainScreen.bounds)  
-      @window.makeKeyAndVisible   
-      if @layout == 'Navigation'
-        # @layouts/navigation@
-                        
-        @window.rootViewController = UINavigationController.alloc.initWithRootViewController(controller)           
-      elsif @layout == 'Tab Bar'           
-        controller = MainController.alloc.initWithNibName(nil, bundle: nil)    
-        nav_controller = UINavigationController.alloc.initWithRootViewController(controller)
-
-        tab_controller = UITabBarController.alloc.initWithNibName(nil, bundle: nil)
-        tab_controller.viewControllers = [nav_controller]
-        
-        @window.rootViewController = tab_controller                       
-      else     
-        @window.rootViewController = MainController.alloc.initWithNibName(nil, bundle: nil)           
-      end  
-      true
-    end    
   end
-  
-  class Controller < UIViewController   
-    attr_accessor :next_controller
     
-    def on_next 
-      self.navigationController.pushViewController(@next_controller, animated: true)      
+  def self.setup_framework(app, path)
+    lib_dir = File.join(path, 'lib')
+    lib_code = render_code(File.join(lib_dir, 'dynamics.rb'))
+    new_code = lib_code
+    lib_code.scan(/# \@\@.+\@\@.+# \@\@End\@\@/m) do |block|    
+      block.scan(/# \@\@.+\@\@/) do |placeholder|
+        layout = placeholder.split(' ')[1].gsub('@', '')
+        case layout
+           when 'Navigation' then new_code = new_code.gsub(block, code_navigation)
+        end      
+      end
     end
-       
-  private
-   
-    def viewDidLoad
-      super
-      
-      self.title = App.name
-      self.view.backgroundColor = UIColor.whiteColor  
-    end    
+    f = File.open(File.join(lib_dir, 'dynamics.rb'), 'w+')   
+    f.write(new_code) 
+    f.close
+  
+    app.files.unshift(File.join(lib_dir, 'dynamics.rb')) 
   end
   
-  class Window < UIWindow
-  end  
+private
+
+  def self.code_navigation
+    code = "# @@Navigation@@\n"
+    code += "controller = MainController.alloc.initWithNibName(nil, bundle: nil)\n"  
+    code += "controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('Next', style: UIBarButtonItemStyleBordered, target:controller, action:'on_next')\n"      
+    code += "sub1_controller = Sub1Controller.alloc.initWithNibName(nil, bundle: nil)\n"
+    code += "sub1_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('Next', style: UIBarButtonItemStyleBordered, target:sub1_controller, action:'on_next')\n"              
+    code += "controller.next_controller = sub1_controller\n"
+    code += "sub2_controller = Sub2Controller.alloc.initWithNibName(nil, bundle: nil)\n"
+    code += "sub1_controller.next_controller = sub2_controller\n"   
+    code += "# @@End@@"
+  end
+  
+  def self.render_code(name)
+      f = File.open(name)     
+      content = f.read
+      f.close
+      content
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynamics
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Ng Say Joe
@@ -36,7 +36,7 @@ files:
 - base/app/views/main_view.rb
 - base/app/views/sub1_view.rb
 - base/app/views/sub2_view.rb
-- base/templates/layouts/_navigation.rb
+- base/templates/dynamics.rb
 - bin/dynamics
 homepage: http://www.dynamics.io/
 licenses: []

data/base/templates/layouts/_navigation.rb

@@ -1,7 +0,0 @@
-controller = MainController.alloc.initWithNibName(nil, bundle: nil)   
-controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle("Next", style: UIBarButtonItemStyleBordered, target:controller, action:'on_next')      
-sub1_controller = Sub1Controller.alloc.initWithNibName(nil, bundle: nil)
-sub1_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle("Next", style: UIBarButtonItemStyleBordered, target:sub1_controller, action:'on_next')              
-controller.next_controller = sub1_controller
-sub2_controller = Sub2Controller.alloc.initWithNibName(nil, bundle: nil)
-sub1_controller.next_controller = sub2_controller