tay 0.0.4 → 0.0.5

data/lib/tay/builder.rb

@@ -30,8 +30,7 @@ module Tay
     # in this class.
     def build!
       create_output_directory
-      simple_compile_directory('html')
-      simple_compile_directory('assets')
+      spec.source_directories.each { |d| simple_compile_directory(d) }
       compile_files(spec.all_javascript_paths)
       compile_files(spec.all_stylesheet_paths)
       write_manifest
@@ -56,7 +55,9 @@ module Tay
     # If we know the type buy are missing the gem, raise an exception.
     def get_compiled_file_content(path)
       begin
-        Tilt.new(path.to_s).render
+        Tilt.new(path.to_s).render({}, {
+          :spec => spec
+        })
       rescue RuntimeError
         File.read(path)
       end
@@ -72,11 +73,31 @@ module Tay
     # Copy all the files from a directory to the output, compiling
     # them if they are familiar to us. Does not do any sprocketing.
     def simple_compile_directory(directory)
-      Dir[@base_dir.join('src', directory, '**/*')].each do |path|
+      if directory.is_a?(String)
+        # If we just have a single dirname, assume it's under src
+        from_directory = (directory[/\//] ? '' : 'src/') + directory
+
+        directory = {
+          :from => from_directory,
+          :as => directory
+        }
+      end
+
+      directory[:use_tilt] |= true
+
+      Dir[@base_dir.join(directory[:from], '**/*')].each do |path|
         file_in_path = Pathname.new(path)
-        file_out_path = asset_output_filename(src_path_to_out_path(path), Tilt.mappings.keys)
 
-        content = get_compiled_file_content(file_in_path)
+        next unless file_in_path.file?
+
+        file_out_path = remap_path_to_build_directory(path, directory)
+
+        if directory[:use_tilt]
+          content = get_compiled_file_content(file_in_path)
+          file_out_path = asset_output_filename(file_out_path, Tilt.mappings.keys)
+        else
+          content = File.read(file_in_path)
+        end
 
         FileUtils.mkdir_p(file_out_path.dirname)
         File.open(file_out_path, 'w') do |f|
@@ -139,10 +160,11 @@ module Tay
     end
 
     ##
-    # Helper function that converts a base_dir/src/XYZ path to the equivalent
-    # path in the output directory
-    def src_path_to_out_path(path)
-      @output_dir.join(path.to_s.sub(/\A#{@base_dir.to_s}\/src\//, ''))
+    # Helper function that converts a source path to an equivalent path in the
+    # output directory
+    def remap_path_to_build_directory(path, directory_info)
+      base_directory = @base_dir.join(directory_info[:from]).to_s
+      @output_dir.join(path.to_s.sub(/\A#{base_directory}\/?/, directory_info[:as] + '/'))
     end
 
     ##

data/lib/tay/cli/new.rb

@@ -27,6 +27,7 @@ module Tay
         empty_directory(outdir)
         empty_directory(outdir.join('src'))
         empty_directory(outdir.join('src/assets'))
+        empty_directory(outdir.join('src/img'))
         empty_directory(outdir.join('src/html'))
         empty_directory(outdir.join('src/javascripts'))
         empty_directory(outdir.join('src/stylesheets'))

data/lib/tay/manifest_generator.rb

@@ -90,7 +90,7 @@ module Tay
         end
       end
 
-      json
+      { :launch => json }
     end
 
     ##
@@ -157,4 +157,4 @@ module Tay
     end
 
   end
-end
+end

data/lib/tay/specification.rb

@@ -137,6 +137,35 @@ module Tay
     # A Tay::Specification::PackagedApp or nil
     attr_reader :packaged_app
 
+    ##
+    # An array of directories that will be copied to the build directory.
+    # Defaults to "img", "assets", and "html", all files are run through
+    # Tilt before being copied
+    #
+    # If just a directory name is passed, it is assumed to be a sub-dir
+    # of src, and will be copied as the directory name, eg:
+    #
+    # spec.source_directories << "extras"
+    #   # copies src/extras to build/extras
+    #
+    # If you provide a path, it is relative to the root directory, and will be
+    # copied to the build directory under this full relative path, eg:
+    #
+    # spec.source_directories << "non_code/fonts"
+    #   # copies non_code/fonts to build/non_code/fonts
+    #
+    # If you need finer control over where files end up, you can also push an
+    # object on to this list detailing the source directory, and the directory
+    # it will be placed in under the build dir. You can optionally specify
+    # whether to run through Tilt or not (default: yes). eg:
+    #
+    # spec.source_directories << {
+    #   :from => "vendor/bootstrap/img",
+    #   :as => "img",
+    #   :use_tilt => false
+    # }  # copies vendor/bootstrap/img/* to build/img
+    attr_accessor :source_directories
+
     ##
     # The path to the private key used to package this extension. Will default
     # to ./EXTNAME.pem
@@ -153,6 +182,7 @@ module Tay
       @icons = {}
       @stylesheets = []
       @javascripts = []
+      @source_directories = %w{img assets html}
 
       yield self
     end

data/lib/tay/version.rb

@@ -1,3 +1,3 @@
 module Tay
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tay
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -249,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1815708585182084014
+      hash: 3841744028028024914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1815708585182084014
+      hash: 3841744028028024914
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24