lib/ib/project.rb in ib-0.6.0 vs lib/ib/project.rb in ib-0.7.0

@@ -1,21 +1,42 @@
 # -*- encoding : utf-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}
   RESOURCE_EXTENSIONS = %W{
     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`.
   # The following steps will occur
   #
   # * `setup_paths` - This step sets up the paths to your project's 'resources',
   #   'pods' and 'supporting files'.
@@ -42,11 +63,11 @@
   def target
     @target ||= project.new_target(:static_library, 'ib', platform)
   end
 
   def generator
-    @generator ||= IB::Generator.new(detect_platform)
+    @generator ||= IB::Generator.new(platform)
   end
 
   def resources
     @resources ||= project.new_group("Resources")
   end
@@ -57,28 +78,11 @@
 
   def pods
     @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
 
   def generate_stub_files
@@ -88,17 +92,20 @@
     file = support_files.new_file File.join(ib_project_path, 'Stubs.m')
     target.add_file_references([ file ])
   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
 
   def add_pods
     Dir.glob("#{pods.path}/**/*.h") do |file|