pyro 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466d3bf298063248a37e9cca1c9410f3df3af692
-  data.tar.gz: 3b188ddb71727a2883d5f02ea40e3c4fbc8f9de8
+  metadata.gz: 6bd1bf4ed996354ed3062c91b4a02b715134ac06
+  data.tar.gz: b8b339877b19d8bbbd5f88bcb3ee6bee10703557
 SHA512:
-  metadata.gz: 5867cb7ec1177eb5ead0fe4ab41d4934d7033bc4676d838daa2b15df86ec5a4090349ab19b5636cff5cadb4c90de4b5b8f033a6fe2f93f8a73bbae2c75e66bc4
-  data.tar.gz: 09802df518d8d95a7940595962f4739fe0cc41335f60c9bb6cfb97563a0e8b2fec650b8470b3029cf2ee46d2b51da2aa163ee813aa19ea95dd4dfd9454792119
+  metadata.gz: 50a3a7a9826d8a712b9a66093a361e19c2794891d7463dcab2543139f78b7873e0d738d2e515b37d41db8cef969abd85b371da36160bd5efd5a073f1b6f9cb1c
+  data.tar.gz: 0380b829150a09f559f78c12f4225d7f398db8bb6ff1ccc6535b3b9d054a7c74f42931967153ef0fd6c5d94b91527c3083b4903db97251aebd0d0310424586ba

data/.gitignore

@@ -3,3 +3,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+/coverage

data/.travis.yml

@@ -0,0 +1,3 @@
+gemfile:
+  - Gemfile
+language: ruby

data/README.md

@@ -1,13 +1,15 @@
-> **DISCLAIMER**: A lot of this is still being developed.
-
-> Consider this readme a preview of code to come. (see: [Readme Driven Development](http://tom.preston-werner.com/2010/08/23/readme-driven-development.html))
-
----
-
 # Pyro
 
 > Build Ember.js apps with CoffeeScript and Sass... without all that damn configuration.
 
+[![Gem Version](https://badge.fury.io/rb/pyro.png)](http://badge.fury.io/rb/pyro)
+[![Dependency Status](https://gemnasium.com/jarrodtaylor/pyro.png)](https://gemnasium.com/jarrodtaylor/pyro)
+[![Code Climate](https://codeclimate.com/github/jarrodtaylor/pyro.png)](https://codeclimate.com/github/jarrodtaylor/pyro)
+[![Build Status](https://travis-ci.org/jarrodtaylor/pyro.png?branch=master)](https://travis-ci.org/jarrodtaylor/pyro)
+[![Coverage Status](https://coveralls.io/repos/jarrodtaylor/pyro/badge.png?branch=master)](https://coveralls.io/r/jarrodtaylor/pyro?branch=master)
+
+---
+
 Pyro is a Ruby gem for building Ember.js apps. Under the hood, it's a build script wrapped in a web server.
 
 ## tl;dr
@@ -75,7 +77,6 @@ Pyro uses file extensions to determine how to compile your and link to your code
 - CoffeeScript (.coffee)
 - JavaScript (.js)
 - Sass (.scss)
-- Less (.less)
 - CSS (.css)
 - Handlebars (.hbs, .handlebars, .x-handlebars)
 

data/Rakefile

@@ -1,5 +1,3 @@
-#!/usr/bin/env rake
-
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/bin/pyro

@@ -4,31 +4,34 @@ require 'thor'
 require 'pyro'
 
 class PyroCLI < Thor
-  
+
   desc 'new NAME', 'Creats a new app'
   def new(name)
     FileUtils.cp_r("#{File.dirname(__FILE__)}/../template", name)
   end
 
-	desc 'build', 'Builds the app for production'
-  def build
-    Pyro.build
+	desc 'build DIR', 'Builds an app for production'
+  def build(dir = '.')
+    Pyro.build('production', false, dir)
   end
 
-  desc 'serve', 'Starts a Pyro app on localhost, --fast skips asset reloading'
+  desc 'serve DIR', 'Starts a Pyro app on localhost, --fast skips asset reloading'
   option :fast
-  def serve
+  def serve(dir = '.')
     require 'pyro/server'
-    
+
+    PyroServer.set :src_folder, dir
+    PyroServer.set :public_folder, "#{PyroServer.settings.src_folder}/builds/development"
+
     if options[:fast]
       PyroServer.set :fast, true
     else
       PyroServer.set :fast, false
     end
-    
+
     PyroServer.run!
   end
-  
+
 end
 
 PyroCLI.start(ARGV)

data/lib/pyro.rb

@@ -1,33 +1,38 @@
 require 'fileutils'
-require 'pyro/assets/scripts'
-require 'pyro/assets/stylesheets'
-require 'pyro/assets/templates'
+require 'pyro/assets'
 
 module Pyro
   include Pyro::Assets
-    
-  def self.build(target = 'production', fast = false)
-    unless File.exists? './lib/index.erb'
+
+  def self.build(target = 'production', fast = false, working_dir = '.')
+    @timestamp   = Time.now.strftime("%Y%m%d%H%M%S")
+    @working_dir = working_dir
+
+    unless File.exists? "#{@working_dir}/lib/index.erb"
       raise 'Can\'t find an index.erb file to build.'
     end
-    
-    $timestamp = Time.now.strftime("%Y%m%d%H%M%S")
-  
+
     if target == 'development'
-      $build_dir = './builds/development'
+      @build_dir = "#{@working_dir}/builds/development"
     else
-      $build_dir = "./builds/production/#{$timestamp}"
+      @build_dir = "#{@working_dir}/builds/production/#{@timestamp}"
     end
-    
-    FileUtils.mkdir_p($build_dir)
-    
+
+    FileUtils.mkdir_p(@build_dir)
+
     unless fast
-      FileUtils.cp_r('./assets/.', $build_dir)
-      FileUtils.cp_r('./vendor',   $build_dir)
+      FileUtils.cp_r("#{@working_dir}/assets/.", @build_dir)
+      FileUtils.cp_r("#{@working_dir}/vendor",   @build_dir)
+    end
+
+    File.open("#{@build_dir}/index.html", 'w+') do |index|
+      index.write(
+        ERB.new(File.read "#{@working_dir}/lib/index.erb").result(binding)
+      )
     end
     
-    File.open("#{$build_dir}/index.html", 'w+') do |index|
-      index.write( ERB.new(File.read './lib/index.erb').result(binding) )
+    if target == 'production'
+      compress(@build_dir)
     end
   end
 end

data/lib/pyro/assets.rb

@@ -0,0 +1,131 @@
+require 'fileutils'
+require 'coffee-script'
+require 'jsmin'
+require 'sass'
+
+module Pyro
+  module Assets
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+
+      def script(*args)
+        tags  = ''
+        find_files(args.first, 'js,coffee').each do |file|
+          tags << compile(file, 'js')
+        end
+        tags
+      end
+
+      def stylesheet(*args)
+        tags  = ''
+        find_files(args.first, 'css,scss').each do |file|
+          tags << compile(file, 'css')
+        end
+        tags
+      end
+
+      def template(*args)
+        tags  = ''
+        find_files(args.first, 'hbs,handlebars,x-handlebars').each do |file|
+          tags << "<script type='text/x-handlebars' data-template-name='#{parse_name(args.first, file)}'>\n"
+          tags << File.read(file)
+          tags << "\n</script>\n"
+        end
+        tags
+      end
+
+      private
+
+      def find_files(args, extensions)
+        files = []
+        if args[:src]
+          files << "#{@working_dir}/lib/#{args[:src]}"
+        elsif args[:dir]
+          Dir.glob("#{@working_dir}/lib/#{args[:dir]}/**/*.{#{extensions}}").each do |f|
+            files << f
+          end
+        end
+        files
+      end
+
+      def parse_path(path)
+        p = {}
+        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}/")
+        p[:contents] = File.read(path)
+        p
+      end
+
+      def parse_name(args, file)
+        if args[:name]
+          name = args[:name]
+        elsif args[:src]
+          name = f.split('/').last.split('.').first
+        elsif args[:dir]
+          name = file.sub("#{@working_dir}/lib/#{args[:dir]}/", '').split('.').first
+        else
+          name = 'name-not-found'
+        end
+        name
+      end
+
+      def generate_file(path_attrs, extension)
+        FileUtils.mkdir_p(path_attrs[:build_path])
+        File.open("#{path_attrs[:build_path]}/#{path_attrs[:name]}.#{extension}", 'w+') do |f|
+          f.write(path_attrs[:contents])
+        end
+      end
+
+      def generate_link(path, extension)
+        path = path.sub(@working_dir, '')
+        case extension
+        when 'js'
+          "<script src='#{path}?#{@timestamp}' type='text/javascript'></script>"
+        when 'css'
+          "<link rel='stylesheet' href='#{path}?#{@timestamp}' type='text/css' />"
+        end
+      end
+
+      def compile(file, extension)
+        path_attrs = parse_path(file)
+
+        case path_attrs[:extension]
+        when 'coffee'
+          path_attrs[:contents] = CoffeeScript.compile(path_attrs[:contents])
+        when 'scss'
+          path_attrs[:contents] = Sass::Engine.new( path_attrs[:contents],
+                                                  { style: :expanded,
+                                                    syntax: :scss } ).render
+        end
+        generate_file(path_attrs, extension)
+
+        generate_link(file.gsub(path_attrs[:extension], extension), extension)
+      end
+      
+      def compress(dir)
+        Dir.glob("#{dir}/**/*.js").each do |file|
+          contents = File.read(file)
+          File.open(file, 'w+') do |f|
+            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
+
+    end
+  end
+end

data/lib/pyro/server.rb

@@ -4,20 +4,14 @@ require 'erb'
 
 class PyroServer < Sinatra::Base
   include Pyro
-  
+
   set :port, 5678
   set :public_folder, './builds/development'
   set :fast_build, false
-  
-  #helpers do
-  #  define_method(:script)     { |*args| Pyro.script     public_folder, args }
-  #  define_method(:stylesheet) { |*args| Pyro.stylesheet args }
-  #  define_method(:template)   { |*args| Pyro.template   args }
-  #end
-  
+
   get '/?' do
-    Pyro.build('development', settings.fast_build)
+    Pyro.build('development', settings.fast_build, settings.src_folder)
     settings.fast_build = settings.fast
-    File.read('./builds/development/index.html')
+    File.read("#{settings.src_folder}/builds/development/index.html")
   end
 end

data/pyro.gemspec

@@ -4,11 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "pyro"
-  gem.version       = "0.8.1"
+  gem.version       = "0.8.2"
   gem.authors       = "Jarrod Taylor"
   gem.email         = "jarrodtaylor@icloud.com"
-  gem.summary       = "Build Ember.js apps with CoffeeScript and Sass... without all that damn configuration."
   gem.homepage      = "https://github.com/jarrodtaylor/pyro"
+  gem .license      = 'MIT'
+  gem.summary       = "Build Ember.js apps with CoffeeScript and Sass...
+                       without all that damn configuration."
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -17,9 +19,11 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'coffee-script'
   gem.add_dependency 'jsmin'
-  gem.add_dependency 'less'
+  gem.add_dependency 'minitest'
   gem.add_dependency 'rake'
   gem.add_dependency 'sass'
   gem.add_dependency 'sinatra'
   gem.add_dependency 'thor'
+
+  gem.add_development_dependency 'coveralls'
 end

data/template/lib/index.erb

@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>Ember Starter Kit</title>
   <%= stylesheet src: 'stylesheets/normalize.css' %>
-  <%= stylesheet src: 'stylesheets/style.css' %>
+  <%= stylesheet src: 'stylesheets/style.scss' %>
 </head>
 <body>
   <%= template dir: 'templates' %>

data/template/lib/stylesheets/style.scss

@@ -0,0 +1,7 @@
+/* Put your SCSS here */
+
+$margin: 20px;
+
+html, body {
+    margin: 20px;
+}

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+require 'coveralls'
+Coveralls.wear!
+
+require './lib/pyro.rb'
+
+require 'minitest'
+require 'minitest/autorun'
+require 'minitest/pride'

data/test/test_pyro.rb

@@ -0,0 +1,18 @@
+class TestPyro < Minitest::Test
+
+  def test_build
+    Pyro.build('development', false, './template')
+    assert Dir.exists?('./template/builds/development')
+    
+    Pyro.build('production', false, './template')
+    assert Dir.exists?('./template/builds/production')
+    
+    FileUtils.rm_rf('./template/builds')
+    refute Dir.exists?('./template/builds')
+    
+    assert_raises RuntimeError do
+      Pyro.build
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyro
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Jarrod Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: less
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: jarrodtaylor@icloud.com
 executables:
@@ -116,30 +130,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/pyro
 - lib/pyro.rb
-- lib/pyro/assets/scripts.rb
-- lib/pyro/assets/stylesheets.rb
-- lib/pyro/assets/templates.rb
+- lib/pyro/assets.rb
 - lib/pyro/server.rb
 - pyro.gemspec
 - template/assets/img/favicon.ico
 - template/lib/app.coffee
 - template/lib/index.erb
 - template/lib/stylesheets/normalize.css
-- template/lib/stylesheets/style.css
+- template/lib/stylesheets/style.scss
 - template/lib/templates/application.hbs
 - template/lib/templates/index.hbs
 - template/vendor/ember/ember-1.0.0-rc.7.js
 - template/vendor/ember/ember-data-0.13.js
 - template/vendor/handlebars/handlebars-1.0.0.js
 - template/vendor/jquery/jquery-1.9.1.js
+- test/test_helper.rb
+- test/test_pyro.rb
 homepage: https://github.com/jarrodtaylor/pyro
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -157,9 +173,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Build Ember.js apps with CoffeeScript and Sass... without all that damn configuration.
-test_files: []
-has_rdoc: 
+test_files:
+- test/test_helper.rb
+- test/test_pyro.rb

data/lib/pyro/assets/scripts.rb

@@ -1,47 +0,0 @@
-require 'fileutils'
-require 'coffee-script'
-
-module Pyro
-  module Assets
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-    
-    module ClassMethods
-      
-      def script *args
-        args = args.first
-
-        scripts = []
-        scripts << "./lib/#{args[:src]}" if args[:src]
-        if args[:dir]
-          Dir.glob("./lib/#{args[:dir]}/**/*.{js,coffee}").each do |f|
-            scripts << f
-          end
-        end
-        
-        tags = ''
-        scripts.each do |s|
-          file_name = s.split('/').last
-          extension = s.split('.').last
-          name = file_name.sub(".#{extension}", '')
-          path = s.sub(file_name, '')
-          build_path = path.sub('./', "#{$build_dir}/")
-          FileUtils.mkdir_p(build_path)
-          
-          contents = File.read(s)
-          contents = CoffeeScript.compile(contents) if extension == 'coffee'
-          
-          File.open("#{build_path}/#{name}.js", 'w+') do |f|
-            f.write(contents)
-          end
-          
-          tags << "<script src='#{s.gsub(extension, 'js')}?#{$timestamp}' type='text/javascript'></script>"
-        end
-        
-        tags
-      end
-      
-    end
-  end
-end

data/lib/pyro/assets/stylesheets.rb

@@ -1,53 +0,0 @@
-require 'fileutils'
-require 'less'
-require 'sass'
-
-module Pyro
-  module Assets
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-  
-    module ClassMethods
-  
-      def stylesheet *args
-        args = args.first
-        
-        stylesheets = []
-        stylesheets << "./lib/#{args[:src]}" if args[:src]
-        if args[:dir]
-          Dir.glob("./lib/#{args[:dir]}/**/*.{css,scss,less}").each do |f|
-            stylesheets << f
-          end
-        end
-              
-        tags = ''
-        stylesheets.each do |s|
-          file_name = s.split('/').last
-          extension = s.split('.').last
-          name = file_name.sub(".#{extension}", '')
-          path = s.sub(file_name, '')
-          build_path = path.sub('./', "#{$build_dir}/")
-          FileUtils.mkdir_p(build_path)
-        
-          contents = File.read(s)
-          case extension
-          when 'scss'
-            contents = Sass::Engine.for_file(s, { style: :expanded }).render
-          when 'less'
-            contents = Less::Parser.new.parse(contents).to_css
-          end
-        
-          File.open("#{build_path}/#{name}.css", 'w+') do |f|
-            f.write(contents)
-          end
-        
-          tags << "<link rel='stylesheet' href='#{s.gsub(extension, 'css')}?#{$timestamp}' type='text/css' />"
-        end
-        
-        tags
-      end
-  
-    end
-  end
-end

data/lib/pyro/assets/templates.rb

@@ -1,46 +0,0 @@
-require 'fileutils'
-
-module Pyro
-  module Assets
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-  
-    module ClassMethods
-  
-      def template *args
-        args = args.first
-        
-        templates = []
-        templates << "./lib/#{args[:src]}" if args[:src]
-        if args[:dir]
-          Dir.glob("./lib/#{args[:dir]}/**/*.{hbs, handlebars,x-handlebars}").each do |f|
-            templates << f
-          end
-        end
-      
-        tags = ''
-        templates.each do |t|
-          contents  = File.read t
-          
-          if args[:name]
-            name = args[:name]
-          elsif args[:src]
-            name = t.split('/').last.split('.').first
-          elsif args[:dir]
-            name = t.sub("./lib/#{args[:dir]}/", '').split('.').first
-          else
-            name = 'name-not-found'
-          end
-          
-          tags << "\n<script type='text/x-handlebars' data-template-name='#{name}'>\n"
-          tags << contents
-          tags << "\n</script>\n"
-        end
-      
-        tags
-      end
-  
-    end
-  end
-end

data/template/lib/stylesheets/style.css

@@ -1,4 +0,0 @@
-/* Put your CSS here */
-html, body {
-    margin: 20px;
-}