pyro 0.9.0 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48cc7d2dd7db7c1678d85fe0cecb8992803a30d9
-  data.tar.gz: 7cffa1ce48fc4f6a68c33272f246288657cfd78e
+  metadata.gz: bbd5afb69830d1640ab6d13d5078558c27311a3b
+  data.tar.gz: a944401a77fe94e767c5c8636e03cc2188b94bef
 SHA512:
-  metadata.gz: 7a853a12955f7060690bb4c5e0b8a3a2b83b60b434bbcf565cd9e0c15bdf1d0668ec15660e4b89d3d622134699090f90c324abaeb5692d308365159ca180c208
-  data.tar.gz: 8af880a834da535b189964dd222c1e04d33fc7ea64d937d12a3f12701190945de785f733adadb479c88809f3f47c13c0f1b0beaaad7ff71cde488364fbe9f0b5
+  metadata.gz: c4bd3c62c7502fa6c39c75beb7ca04df27a530f71b7174f3de2b39942f03dacb1b5ae618b226fe785327f1961c18041dba77086dd14fb25e8e8248591e360c6f
+  data.tar.gz: 3efd9c17314c130e00e106091f56fd4afb683af843e9c9def9a19c234e207c6cea116ac5f27c21ca255a69910741ac51f28f72db241cdd28fa6928572cfd93ac

data/README.md

@@ -107,7 +107,7 @@ Everything will be built on the first page load, but reloads will only rebuild `
 When you're ready to deploy, the ```pyro build``` command will compile and minify your app into ```/builds/production/<timestamp>```:
 
 ```bash
-~/MyApp $ pyro build
+~/MyApp $ pyro burn
 # => MyApp is compiled and minified into ~/MyApp/builds/production/20130816020233/
 ```
 

data/bin/pyro

@@ -10,27 +10,48 @@ class PyroCLI < Thor
     FileUtils.cp_r("#{File.dirname(__FILE__)}/../templates/app", name)
   end
 
-	desc 'build DIR', 'Builds an app for production'
-  def build(dir = '.')
-    Pyro.build('production', false, dir)
+	desc 'burn DIR', 'Builds an app for production'
+  def burn(dir = '.')
+    Pyro.burn('production', false, dir)
   end
 
-  desc 'serve DIR', 'Starts a Pyro app on localhost,
-                    --fast skips asset reloading'
+  desc 'serve', 'Starts a Pyro app on localhost,
+                 --fast skips asset reloading,
+                 --test includes tests'
+
   option :fast
-  def serve(dir = '.')
+  option :test
+  def serve
     require 'pyro/server'
 
-    PyroServer.set :src_folder, dir
-    PyroServer.set :public_folder,
-                   "#{PyroServer.settings.src_folder}/tmp"
-
     if options[:fast]
       PyroServer.set :fast, true
     else
       PyroServer.set :fast, false
     end
 
+    PyroServer.set(:target, 'test') if options[:test]
+
+    PyroServer.run!
+  end
+
+  desc 'stage BUILD', 'Stages a Pyro build on localhost'
+  def stage(build_num = false)
+    if build_num
+      build_dir = "./pkg/#{build_num}"
+    else
+      Pyro.burn('production', false) if Dir.glob('./pkg/**').count == 0
+      build_dir = Dir.glob('./pkg/**').last
+    end
+
+    unless Dir.exists? build_dir
+      puts "That build doesn't exist. Try running 'pyro burn' to create a build."
+      exit
+    end
+
+    require 'pyro/server'
+    PyroServer.set :public_folder, build_dir
+    PyroServer.set :staging, true
     PyroServer.run!
   end
 

data/lib/pyro.rb

@@ -4,17 +4,17 @@ require 'pyro/assets'
 module Pyro
   include Pyro::Assets
 
-  def self.build(target = 'production', fast = false, working_dir = '.')
+  def self.burn(target = 'production', fast = false, working_dir = '.')
     @target      = target
     @timestamp   = Time.now.strftime "%Y%m%d%H%M%S"
     @working_dir = working_dir
     @links       = []
 
     unless File.exists? "#{@working_dir}/index.erb"
-      raise 'Can\'t find an index.erb file to build.'
+      raise 'Can\'t find an index.erb file to burn.'
     end
 
-    if @target == 'development'
+    if @target == 'development' || @target == 'test'
       @build_dir = "#{@working_dir}/tmp"
     else
       @build_dir = "#{@working_dir}/pkg/#{@timestamp}"
@@ -31,7 +31,7 @@ module Pyro
     File.open("#{@build_dir}/index.html", 'w+') do |f|
       f.write( ERB.new(File.read "#{@working_dir}/index.erb").result(binding) )
     end
-    
+
     compress(@build_dir) if @target == 'production'
   end
 end

data/lib/pyro/asset.rb

@@ -0,0 +1,101 @@
+require 'barber'
+require 'coffee-script'
+require 'fileutils'
+require 'sass'
+
+module Pyro
+  class Asset
+    attr_accessor :file, :build_dir, :working_dir, :helper_args
+
+    def initialize(args)
+      args.each { |k, v| instance_variable_set("@#{k}", v) }
+    end
+
+    def mtime
+      File.mtime file
+    end
+
+    def basename
+      File.basename file
+    end
+
+    def dirname
+      File.dirname file
+    end
+
+    def extname
+      File.extname file
+    end
+
+    def name
+      basename.sub(extname, '')
+    end
+
+    def timestamp
+      mtime.strftime "%Y%m%d%H%M%S"
+    end
+
+    def relative_dir
+      dirname.sub("#{working_dir}/", '')
+    end
+
+    def relative_file
+      if helper_args[:target]
+        helper_args[:target]
+      else
+        "#{relative_dir}/#{name}#{compiled_ext}"
+      end
+    end
+
+    def compiled_ext
+      case extname
+      when '.coffee', '.hbs', '.handlebars'
+        '.js'
+      when '.scss'
+        '.css'
+      else
+        extname
+      end
+    end
+
+    def contents
+      contents = File.read file
+      case extname
+      when '.coffee'
+        contents = CoffeeScript.compile(contents, bare: true)
+      when '.scss'
+        contents = Sass::Engine.new(contents, { syntax: :scss }).render
+      when '.hbs', '.handlebars'
+        contents = Barber::Ember::FilePrecompiler.call(contents)
+        contents = "Ember.TEMPLATES['#{template_name}'] = #{contents}"
+      end
+      contents
+    end
+
+    def template_name
+      if helper_args[:name]
+        helper_args[:name]
+      elsif helper_args[:src]
+        name
+      elsif helper_args[:dir]
+        file.sub("#{working_dir}/#{helper_args[:dir]}/", '').sub(extname, '')
+      else
+        'name-not-found'
+      end
+    end
+
+    def generate_file
+      FileUtils.mkdir_p "#{build_dir}/#{relative_dir}"
+      File.open("#{build_dir}/#{relative_file}", 'a+') { |f| f.write contents }
+    end
+
+    def generate_link
+      case compiled_ext
+      when '.js'
+        "<script type='text/javascript' src='#{relative_file}?#{timestamp}'></script>\n"
+      when '.css'
+        "<link type='text/css' rel='stylesheet' href='#{relative_file}?#{timestamp}' />\n"
+      end
+    end
+  end
+end

data/lib/pyro/assets.rb

@@ -1,8 +1,7 @@
-require 'barber'
-require 'coffee-script'
 require 'fileutils'
 require 'jsmin'
 require 'sass'
+require 'pyro/asset'
 
 module Pyro
   module Assets
@@ -12,131 +11,52 @@ module Pyro
 
     module ClassMethods
 
-      def script(*args)
-        tags  = ''
-        find_files(args.first, 'js, coffee').each do |file|
-          tags << compile(args.first, file, 'js')
-        end
-        tags
-      end
+      define_method(:script)     { |*args| build(args.first, 'js, coffee')      }
+      define_method(:stylesheet) { |*args| build(args.first, 'css, scss')       }
+      define_method(:template)   { |*args| build(args.first, 'hbs, handlebars') }
 
-      def stylesheet(*args)
-        tags  = ''
-        find_files(args.first, 'css, scss').each do |file|
-          tags << compile(args.first, file, 'css')
-        end
-        tags
+      def test(*args)
+        build(args.first, 'js, coffee, css, scss') if @target == 'test'
       end
 
-      def template(*args)
-        tags  = ''
-        find_files(args.first, 'hbs, handlebars').each do |file|
-          tags << compile(args.first, file, 'js')
+      private
+
+      def build(args, src_ext)
+        tags = ''
+        find_assets(args, src_ext).each do |asset|
+          asset.generate_file
+          link = asset.generate_link
+          unless @links.include? link
+            @links << link
+            tags << link
+          end
         end
         tags
       end
 
-      private
-
-      def find_files(args, extensions)
+      def find_assets(args, exts)
         if @target == 'production'
           args[:src] = args[:prod_src] if args[:prod_src]
           args[:dir] = args[:prod_dir] if args[:prod_dir]
         end
-        
-        files = []
-        if args[:src]
-          files << "#{@working_dir}/#{args[:src]}"
-        elsif args[:dir]
-          Dir.glob("#{@working_dir}/#{args[:dir]}/**/*.{#{extensions}}").each do |f|
-            files << f
-          end
-        end
-        files
-      end
-
-      def parse_path(args, path)
-        p = {}
-        p[:contents] = File.read(path)
-        p[:file_name] = path.split('/').last
-        p[:extension] = path.split('.').last
-        p[:name] = p[:file_name].sub(".#{p[:extension]}", '')
-        p[:path] = path.sub(p[:file_name], '')
-        p[:build_path] = p[:path].sub('./', "#{@build_dir}/")
-        
-        if args[:target]
-          target_name = args[:target].split('/').last
-          target_ext  = target_name.split('.').last
-          args[:target] = args[:target].sub(".#{target_ext}", '')
-          p[:target_path] = "#{@build_dir}/#{args[:target]}"
-        else
-          p[:target_path] = "#{p[:build_path]}#{p[:name]}"
-        end
-        
-        p[:target_link] = p[:target_path].sub(@build_dir, '')
-        p
-      end
 
-      def parse_name(args, file)
-        if args[:name]
-          name = args[:name]
-        elsif args[:src]
-          name = f.split('/').last.split('.').first
+        assets = []
+        if args[:src]
+          assets << Asset.new(file: "#{@working_dir}/#{args[:src]}",
+                         build_dir: @build_dir,
+                       working_dir: @working_dir,
+                       helper_args: args)
         elsif args[:dir]
-          name = file.sub("#{@working_dir}/#{args[:dir]}/", '').split('.').first
-        else
-          name = 'name-not-found'
-        end
-        name
-      end
-
-      def generate_file(path_attrs, extension, template_name)
-        FileUtils.mkdir_p(path_attrs[:build_path])
-        File.open("#{path_attrs[:target_path]}.#{extension}", 'a+') do |f|
-          if template_name == ''
-            f.write(path_attrs[:contents])
-          else
-            f.write("Ember.TEMPLATES['#{template_name}'] = #{path_attrs[:contents]}")
+          Dir.glob("#{@working_dir}/#{args[:dir]}/**/*.{#{exts}}").each do |file|
+            assets << Asset.new(file: file,
+                           build_dir: @build_dir,
+                         working_dir: @working_dir,
+                         helper_args: args)
           end
         end
+        assets
       end
 
-      def generate_link(path, extension)
-        case extension
-        when 'js'
-          link = "<script src='#{path}.#{extension}?#{@timestamp}' type='text/javascript'></script>"
-        when 'css'
-          link = "<link rel='stylesheet' href='#{path}.#{extension}?#{@timestamp}' type='text/css' />"
-        end
-        
-        if @links.include? link
-          ''
-        else
-          @links << link
-          link
-        end
-      end
-
-      def compile(args, file, extension)
-        path_attrs = parse_path(args, file)
-        template_name = ''
-
-        case path_attrs[:extension]
-        when 'coffee'
-          path_attrs[:contents] = CoffeeScript.compile(path_attrs[:contents], bare: true)
-        when 'hbs', 'handlebars'
-          path_attrs[:contents] = Barber::Ember::FilePrecompiler.call(path_attrs[:contents])
-          template_name = parse_name(args, file)
-        when 'scss'
-          path_attrs[:contents] = Sass::Engine.new( path_attrs[:contents],
-                                                  { style: :expanded,
-                                                    syntax: :scss } ).render
-        end
-        
-        generate_file(path_attrs, extension, template_name)
-        generate_link(path_attrs[:target_link], extension)
-      end
-      
       def compress(dir)
         Dir.glob("#{dir}/**/*.js").each do |file|
           contents = File.read(file)
@@ -144,14 +64,13 @@ module Pyro
             f.write(JSMin.minify(contents).strip)
           end
         end
-        
+
         Dir.glob("#{dir}/**/*.css").each do |file|
           contents = File.read(file)
           File.open(file, 'w+') do |f|
             f.write(Sass::Engine.new( contents, { style: :compressed,
                                                  syntax: :scss } ).render)
           end
-          
         end
       end
 

data/lib/pyro/server.rb

@@ -5,13 +5,18 @@ require 'erb'
 class PyroServer < Sinatra::Base
   include Pyro
 
-  set :port, 5678
+  set :fast_build,    false
+  set :port,          7976
   set :public_folder, './tmp'
-  set :fast_build, false
+  set :staging,       false
+  set :target,        'development'
 
   get '/?' do
-    Pyro.build('development', settings.fast_build, settings.src_folder)
-    settings.fast_build = settings.fast
-    File.read("#{settings.src_folder}/tmp/index.html")
+    unless settings.staging
+      Pyro.burn(settings.target, settings.fast_build)
+      settings.fast_build = settings.fast
+    end
+
+    File.read "#{settings.public_folder}/index.html"
   end
 end

data/pyro.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "pyro"
-  gem.version       = "0.9.0"
+  gem.version       = "1.0.0.rc1"
   gem.authors       = "Jarrod Taylor"
   gem.email         = "jarrodtaylor@icloud.com"
   gem.homepage      = "https://github.com/jarrodtaylor/pyro"
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'barber',            '~> 0.4.2'
   gem.add_dependency 'execjs',            '~> 1.4.0'
   gem.add_dependency 'coffee-script',     '~> 2.2.0'
-  gem.add_dependency 'ember-source',      '~> 1.0.0.rc8'
+  gem.add_dependency 'ember-source',      '~> 1.0.0'
   gem.add_dependency 'handlebars-source', '~> 1.0.12'
   gem.add_dependency 'jsmin',             '~> 1.0.1'
   gem.add_dependency 'sass',              '~> 3.2.10'

data/templates/app/index.erb

@@ -1,23 +1,28 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
-<title>Ember Starter Kit</title>
+  <meta charset="utf-8">
+  <title>Ember Starter Kit</title>
   <%= stylesheet src: 'resources/stylesheets/normalize.css' %>
   <%= stylesheet src: 'resources/stylesheets/style.scss' %>
+
+  <%= test src: 'vendor/qunit/qunit.css' %>
 </head>
 <body>
   <%= script src: 'vendor/jquery/jquery-1.9.1.js',
           target: 'vendor/concatenated.js' %>
   <%= script src: 'vendor/handlebars/handlebars-1.0.0.js',
           target: 'vendor/concatenated.js' %>
-  <%= script src: 'vendor/ember/ember-1.0.0-rc.8.js',
+  <%= script src: 'vendor/ember/ember.js',
         prod_src: 'vendor/ember/ember.prod.js',
           target: 'vendor/concatenated.js' %>
-  <%= script src: 'vendor/ember/ember-data-0.13.js',
+  <%= script src: 'vendor/ember/ember-data.js',
+        prod_src: 'vendor/ember/ember-data.prod.js',
           target: 'vendor/concatenated.js' %>
-  
+
   <%= script src: 'lib/app.coffee' %>
   <%= template dir: 'lib/templates' %>
+
+  <%= test src: 'test/example.coffee' %>
 </body>
 </html>