rugular 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d071512d3ab5d3a4c2dc9feb577a2bf915cdc7e
-  data.tar.gz: 6d7ade01d611534225776c420ab1135317ef1e2a
+  metadata.gz: 6b72e78b18b21cfe1e4ac2a4b05b03540b270f27
+  data.tar.gz: b4fed9cde117145d9abafbc1ed8146938e256224
 SHA512:
-  metadata.gz: 05717e162826c18155fe5866a61e6e40cfb2284bdd147f37047e71ff973f0f6daa28b56c2f9278186b62d2b9404f0ed1a85affc4ba27742f4191f65861bda03f
-  data.tar.gz: 2c1327afd4319480e045028c4b8749c3ed89add1def4d3a849ad7d4d2e1ee4f601724d03f4e7bc0a1e53f96a0084397fa9fd7a1cb8a11d948ccb8f5786a9bdf9
+  metadata.gz: 01215319deab4e9e794dd35dc47f00dcbb35db0451b87371fc4ea01ee5d17ce88a47e3275233d0614a9c1e04b77693eae93b6f0f59059d3fb82adb34e38cc27f
+  data.tar.gz: aff35dd9b8db79d498b142b662068a4c2c7bca3eabdcf880f0283e789493af58df3706dbb2ce516f40749527158c88c640c3a6c990b6cfced6e37420e00709a6

data/README.md

@@ -60,7 +60,7 @@ A new Rugular project contains the following folders and files:
 │   ├──  components/
 │   ├──  favico.ico
 ├──  vendor/
-├──  vendor_and_bower_components.yaml
+├──  bower_components.yaml
 </pre>
 
 | Folder/File Name | Description |
@@ -78,13 +78,13 @@ A new Rugular project contains the following folders and files:
 | src/components | A folder for isolate-scope directives to be used in your application code. This folder is also described in [How to Write Rugular apps](#how-to-write-rugular-apps). |
 | src/assets | A folder to place assets, including but not limited to, ``.png``, ``.woff``, ``.svg``, ``.pdf``. All files placed in the assets folder can be linked by their relative filename, e.g.  ``src/assets/logo.png`` can be linked as ``<img src='assets/logo.png'></img>``
 | vendor | 3rd-party javascript, coffeescript, css, and sass files that do not come with bower management. All of these files are included before any code in src. |
-| vendor_and_bower_components.yaml | A file to declare what third party files in the bower_components and vendor folder you would like to include. |
+| bower_components.yaml | A file to declare what third party files in the bower_components and vendor folder you would like to include. |
 
 ## How to Write Rugular Apps
 
 Application specific code lies in the ``src`` folder. Other files, such as
 bower_components or other 3rd party vendor files are declared in the
-``vendor_and_bower_components.yaml`` file.
+``bower_components.yaml`` file.
 
 Code in the src folder are written in Coffeescript, Haml and Sass and designed
 to follow [Google's Best Practices for an Angular App
@@ -102,10 +102,10 @@ folder (e.g. ``src/app/dashboard/dashboard.module.coffee``) are to be included
 in the ``app.module.coffee`` declaration.
 
 The ``src/app/app.routes.coffee`` file declares a base route, ``root`` for the
-application from which all other routes are derived from; all other routes 
+application from which all other routes are derived from; all other routes
 should be prepended with ``'root.'``.
 
-The``src/app/app.haml`` file serves as an application layout for the rest of 
+The``src/app/app.haml`` file serves as an application layout for the rest of
 your application. If you have directives such as a ``navbar`` or ``footer``
 directive, it is advised to add these directives to this ``haml`` file.
 

data/lib/rugular/tasks/build.rb

@@ -40,7 +40,7 @@ module Rugular
       File.open('dist/application.js', 'w') do |file|
         file.write(
           Uglifier.compile(
-            javascript_files.map do |file|
+            Rugular::JavascriptFiles.map do |file|
               text = File.read(file).gsub('templateUrl', 'template')
               CoffeeScript.compile(text)
             end.join
@@ -105,21 +105,6 @@ module Rugular
       end.join
     end
 
-    def javascript_files
-      Dir.glob("src/components/**/*.module.coffee") +
-        Dir.glob("src/components/**/*.factory.coffee") +
-        Dir.glob("src/components/**/*.filter.coffee") +
-        Dir.glob("src/components/**/*.controller.coffee") +
-        Dir.glob("src/components/**/*.directive.coffee") +
-        Dir.glob("src/components/**/*.routes.coffee") +
-        Dir.glob("src/app/**/*.module.coffee") +
-        Dir.glob("src/app/**/*.factory.coffee") +
-        Dir.glob("src/app/**/*.filter.coffee") +
-        Dir.glob("src/app/**/*.controller.coffee") +
-        Dir.glob("src/app/**/*.directive.coffee") +
-        Dir.glob("src/app/**/*.routes.coffee")
-    end
-
     def bower_css
       bower_yaml.fetch('bower_components').fetch('css').map do |filename|
         File.read('bower_components/' + filename)
@@ -128,7 +113,7 @@ module Rugular
 
 
     def bower_yaml
-      YAML.load(File.read('src/vendor_and_bower_components.yaml'))
+      YAML.load(File.read('src/bower_components.yaml'))
     end
 
     def lib_directory

data/lib/rugular/tasks/helpers/javascript_files.rb

@@ -0,0 +1,18 @@
+module Rugular
+  class JavascriptFiles
+    def self.ordered_array
+      Dir.glob("src/components/**/*.module.coffee") +
+        Dir.glob("src/components/**/*.factory.coffee") +
+        Dir.glob("src/components/**/*.filter.coffee") +
+        Dir.glob("src/components/**/*.controller.coffee") +
+        Dir.glob("src/components/**/*.directive.coffee") +
+        Dir.glob("src/components/**/*.routes.coffee") +
+        Dir.glob("src/app/**/*.module.coffee") +
+        Dir.glob("src/app/**/*.factory.coffee") +
+        Dir.glob("src/app/**/*.filter.coffee") +
+        Dir.glob("src/app/**/*.controller.coffee") +
+        Dir.glob("src/app/**/*.directive.coffee") +
+        Dir.glob("src/app/**/*.routes.coffee")
+    end
+  end
+end

data/lib/rugular/tasks/server/Guardfile

@@ -1,6 +1,6 @@
 require "#{__dir__}/guards/rugular.rb"
 
 guard :rugular do
-  watch /^src\/.+\.[^sass]/
-  watch 'vendor_and_bower_components.yaml'
+  watch /^src\/.+\.(coffee|haml|png|jpg|ttf|woff)$/
+  watch 'bower_components.yaml'
 end

data/lib/rugular/tasks/server/guards/rugular.rb

@@ -1,7 +1,7 @@
 require 'guard'
 require_relative 'rugular_haml'
 require_relative 'rugular_coffee'
-require_relative 'rugular_vendor_and_bower_components'
+require_relative 'rugular_bower_components'
 require_relative 'rugular_index_html'
 require_relative 'rugular_assets'
 
@@ -13,6 +13,10 @@ module Guard
     end
 
     def start
+      create_tmp_directory
+
+      run_on_changes('src/index.haml')
+
       run_all
     end
 
@@ -20,23 +24,22 @@ module Guard
     def reload; true end
 
     def run_all
-      run_on_changes(
-        Dir.glob('src/**/*').unshift('vendor_and_bower_components.yaml')
-      )
+      run_on_changes(Dir.glob('src/**/*').push('bower_components.yaml'))
     end
 
     def run_on_changes(paths)
       [*paths].each do |file|
-        message = case File.extname(file)
-                  when '.coffee' then ::RugularCoffee.compile(file)
-                  when '.haml'   then ::RugularHaml.compile(file)
-                  when '.yaml'   then ::RugularVendorAndBowerComponents.compile
-                  when '.png'    then ::RugularAssets.copy_asset(file)
-                  when '.jpg'    then ::RugularAssets.copy_asset(file)
-                  when '.ttf'    then ::RugularAssets.copy_asset(file)
-                  when '.woff'   then ::RugularAssets.copy_asset(file)
-                  else next 'Rugular does not know how to handle this file'
-                  end
+        message =
+          case File.extname(file)
+          when '.coffee' then ::RugularCoffee.compile(file)
+          when '.haml'   then ::RugularHaml.compile(file)
+          when '.yaml'   then ::RugularBowerComponents.compile
+          when '.png'    then ::RugularAssets.copy_asset(file)
+          when '.jpg'    then ::RugularAssets.copy_asset(file)
+          when '.ttf'    then ::RugularAssets.copy_asset(file)
+          when '.woff'   then ::RugularAssets.copy_asset(file)
+          else "Rugular does not know how to handle #{file}"
+          end
 
         ::RugularIndexHtml.update_javascript_script_tags
 
@@ -50,17 +53,13 @@ module Guard
       [*paths].each do |file|
         ::Guard::UI.info "Guard received delete event for #{file}"
 
-        message = case File.extname(file)
-                  when '.coffee' then ::RugularCoffee.delete(file)
-                  when '.haml'   then ::RugularHaml.delete(file)
-                  when '.png'    then ::RugularAssets.delete_asset(file)
-                  when '.jpg'    then ::RugularAssets.delete_asset(file)
-                  when '.ttf'    then ::RugularAssets.delete_asset(file)
-                  when '.woff'   then ::RugularAssets.delete_asset(file)
-                  when '.yaml'
-                    then fail 'what are you doing? trying to break rugular?!'
-                  else next 'Rugular does not know how to handle this file'
-                  end
+        message =
+          case File.extname(file)
+          when '.coffee' then ::RugularCoffee.delete(file)
+          when '.haml'   then ::RugularHaml.delete(file)
+          when '.yaml'   then fail 'Please do not delete yaml files'
+          else ::RugularAssets.delete_asset(file)
+          end
 
         ::RugularIndexHtml.update_javascript_script_tags
 
@@ -72,10 +71,13 @@ module Guard
 
     private
 
+    def create_tmp_directory
+      FileUtils.mkdir '.tmp' unless File.directory? '.tmp'
+    end
+
     def handle_error_in_guard(error)
       ::Guard::UI.error error.message
       throw :task_has_failed
     end
   end
 end
-

data/lib/rugular/tasks/server/guards/rugular_bower_components.rb

@@ -0,0 +1,46 @@
+require 'uglifier'
+require 'coffee_script'
+require 'uglifier'
+
+class RugularBowerComponents
+  def self.compile
+    new.compile
+  end
+
+  def initialize; end
+
+  def compile
+    ::Guard::UI.info 'Beginning to create a manifest bower files'
+
+    File.open('.tmp/vendor.css', 'w') do |file|
+      file.write bower_css
+    end
+    File.open('.tmp/vendor.js', 'w') do |file|
+      file.write(Uglifier.compile(bower_javascript))
+    end
+
+    'Successfully created manifest bower files'
+  end
+
+  private
+
+  def bower_css
+    bower_yaml.fetch('css').map do |filename|
+      bower_component_file = 'bower_components/' + filename
+      next unless File.file? bower_component_file
+      File.read('bower_components/' + filename)
+    end.join
+  end
+
+  def bower_javascript
+    bower_yaml.fetch('js').map do |filename|
+      bower_component_file = 'bower_components/' + filename
+      next unless File.file? bower_component_file
+      File.read('bower_components/' + filename)
+    end.join
+  end
+
+  def bower_yaml
+    YAML.load(File.read('bower_components.yaml'))
+  end
+end

data/lib/rugular/tasks/server/guards/rugular_index_html.rb

@@ -1,4 +1,5 @@
 require 'nokogiri'
+require_relative '../../helpers/javascript_files'
 
 class RugularIndexHtml
   def self.update_javascript_script_tags
@@ -28,25 +29,10 @@ class RugularIndexHtml
   def javascript_file_script_tags
     Nokogiri::XML::NodeSet.new(
       application_html,
-      javascript_files.map(&convert_to_script_tag)
+      Rugular::JavascriptFiles.ordered_array.map(&convert_to_script_tag)
     )
   end
 
-  def javascript_files
-    Dir.glob("src/components/**/*.module.coffee") +
-      Dir.glob("src/components/**/*.factory.coffee") +
-      Dir.glob("src/components/**/*.filter.coffee") +
-      Dir.glob("src/components/**/*.controller.coffee") +
-      Dir.glob("src/components/**/*.directive.coffee") +
-      Dir.glob("src/components/**/*.routes.coffee") +
-      Dir.glob("src/app/**/*.module.coffee") +
-      Dir.glob("src/app/**/*.factory.coffee") +
-      Dir.glob("src/app/**/*.filter.coffee") +
-      Dir.glob("src/app/**/*.controller.coffee") +
-      Dir.glob("src/app/**/*.directive.coffee") +
-      Dir.glob("src/app/**/*.routes.coffee")
-  end
-
   def convert_to_script_tag
     lambda do |javascript_file|
       tmp_filename = javascript_file.gsub('src', '').gsub('coffee', 'js')

data/lib/rugular/templates/new/bower_components.yaml

@@ -0,0 +1,5 @@
+css:
+  - 'font-awesome/css/font-awesome.min.css'
+js:
+  - 'angular/angular.js'
+  - 'angular-ui-router/release/angular-ui-router.js'

data/lib/rugular/version.rb

@@ -1,3 +1,3 @@
 module Rugular
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rugular
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Nicholas Shook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -312,16 +312,17 @@ files:
 - lib/rugular/tasks/helpers/app_checker.rb
 - lib/rugular/tasks/helpers/backend_url_injector.rb
 - lib/rugular/tasks/helpers/haml_renderer.rb
+- lib/rugular/tasks/helpers/javascript_files.rb
 - lib/rugular/tasks/new.rb
 - lib/rugular/tasks/server.rb
 - lib/rugular/tasks/server/Guardfile
 - lib/rugular/tasks/server/Procfile
 - lib/rugular/tasks/server/guards/rugular.rb
 - lib/rugular/tasks/server/guards/rugular_assets.rb
+- lib/rugular/tasks/server/guards/rugular_bower_components.rb
 - lib/rugular/tasks/server/guards/rugular_coffee.rb
 - lib/rugular/tasks/server/guards/rugular_haml.rb
 - lib/rugular/tasks/server/guards/rugular_index_html.rb
-- lib/rugular/tasks/server/guards/rugular_vendor_and_bower_components.rb
 - lib/rugular/tasks/tmux.rb
 - lib/rugular/tasks/tmux/tmuxinator.yml
 - lib/rugular/templates/directive/_app.sass.erb
@@ -338,6 +339,7 @@ files:
 - lib/rugular/templates/new/.application.sass
 - lib/rugular/templates/new/.gitignore
 - lib/rugular/templates/new/Gemfile
+- lib/rugular/templates/new/bower_components.yaml
 - lib/rugular/templates/new/config.yaml
 - lib/rugular/templates/new/e2e/app_spec.coffee
 - lib/rugular/templates/new/karma.conf.js
@@ -351,7 +353,6 @@ files:
 - lib/rugular/templates/new/src/app/backend.contsant.coffee
 - lib/rugular/templates/new/src/favicon.ico
 - lib/rugular/templates/new/test/spec_helper.js
-- lib/rugular/templates/new/vendor_and_bower_components.yaml
 - lib/rugular/templates/new_erb/bower.json.erb
 - lib/rugular/templates/new_erb/package.json.erb
 - lib/rugular/templates/new_erb/src/index.haml.erb

data/lib/rugular/tasks/server/guards/rugular_vendor_and_bower_components.rb

@@ -1,63 +0,0 @@
-require 'uglifier'
-require 'coffee_script'
-
-class RugularVendorAndBowerComponents
-  def self.compile
-    new.compile
-  end
-
-  def initialize; end
-
-  def compile
-    ::Guard::UI.info 'Beginning to create vendor asset files'
-
-    File.open('.tmp/vendor.css', 'w') do |file|
-      file.write bower_css
-    end
-    File.open('.tmp/vendor.js', 'w') do |file|
-      file.write(Uglifier.compile(bower_and_vendor_javascript))
-    end
-
-    'Successfully created vendor asset files'
-  end
-
-  private
-
-  def bower_and_vendor_javascript
-    bower_javascript + vendor_javascript
-  end
-
-  def bower_css
-    bower_yaml.fetch('bower_components').fetch('css').map do |filename|
-      bower_component_file = 'bower_components/' + filename
-      next unless File.file? bower_component_file
-      File.read('bower_components/' + filename)
-    end.join
-  end
-
-  def bower_javascript
-    bower_yaml.fetch('bower_components').fetch('js').map do |filename|
-      bower_component_file = 'bower_components/' + filename
-      next unless File.file? bower_component_file
-      File.read('bower_components/' + filename)
-    end.join
-  end
-
-  def vendor_javascript
-    bower_yaml.fetch('vendor').fetch('javascript').map do |filename|
-      vendor_file = 'vendor/' + filename
-      next unless File.file? vendor_file
-      File.read(vendor_file)
-    end.join +
-
-    bower_yaml.fetch('vendor').fetch('coffee').map do |filename|
-      vendor_file = 'vendor/' + filename
-      next unless File.file? vendor_file
-      CoffeeScript.compile(File.read('vendor/' + filename))
-    end.join
-  end
-
-  def bower_yaml
-    YAML.load(File.read('vendor_and_bower_components.yaml'))
-  end
-end

data/lib/rugular/templates/new/vendor_and_bower_components.yaml

@@ -1,11 +0,0 @@
-bower_components:
-  css:
-    - 'font-awesome/css/font-awesome.min.css'
-  js:
-    - 'angular/angular.js'
-    - 'angular-ui-router/release/angular-ui-router.js'
-vendor:
-  coffee:
-    - 'some coffee script file'
-  javascript:
-    - 'some javascript file'