rugular 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb10df95777c635560b5e6e1b580f2c396a2ed23
-  data.tar.gz: 9b924893d46177021502ec708508148c37727e83
+  metadata.gz: a53e57efa12ebfc85b6c69ee314e074b7bab13a2
+  data.tar.gz: 1cc5a30c9ae68e05feec0a0b86d4d5f702840305
 SHA512:
-  metadata.gz: 7ef97b9b65899ca20c735053f70b10db28e4e8ed8da0237bda27237f28a9f88f0bfd293fbf7967b843e480ccbc6ceabf57424ffa5cb9a8473828be55758fb301
-  data.tar.gz: 04ac28a6b5fa74b58cdbe3a420025e694119752cc406de69f0354c4e0f480aa28ec8c24676a2a9513a9def9240aedc93208c53b46664e1c3fa701a7af578cb9f
+  metadata.gz: 081e9614dbf0db1e5287dda0424510d16589a22a6b004cb8b31bc1338ad163fb65f3d77360c3029edf1edfcd55d71f5130c61fd0471eda21337237160e7a9832
+  data.tar.gz: 046c81e05df23e184c776b80019ef5afb6d8b9c386d763a90fee778b8b2feb5bcdd5d82a6168e51f76118d373bb46250465deecf2991ed14f058709d495d4215

data/.ruby-version

@@ -0,0 +1 @@
+2.2.0

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+ruby File.read("#{__dir__}/.ruby-version").chomp
+
 # Specify your gem's dependencies in rugular.gemspec
 gemspec
-gem 'guard-coffeescript', github: 'guard/guard-coffeescript', branch: 'master'
+gem 'guard-sass'

data/README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/currica/rugular.svg)](https://travis-ci.org/currica/rugular)
+![Build
+Status](https://circleci.com/gh/currica/rugular.svg?style=shield&circle-token=:circle-token)
 
 # Rugular
 
@@ -6,8 +7,8 @@ Rugular is a ruby scaffolding framework to build AngularJS apps. It builds a
 minified and compressed version of a front-end into the ``./dist`` folder that
 can be served as a standalone AngularJS app. The goal of this framework is to
 create applications written with [best AngularJS
-practices](https://github.com/johnpapa/angularjs-styleguide); CoffeeScript
-optional.
+practices](https://github.com/johnpapa/angularjs-styleguide) using
+CoffeeScript, Haml and Sass.
 
 ## Installation
 
@@ -99,6 +100,13 @@ contain a controller and service namespaced with a new module of the route
 name if one dos not already exist. It will also register the new module in the
 ``app.module.js`` file.
 
+Routes can be nested in another folder representing a module. For example, to
+nest a route inside a pre-existing 'test' module, execute:
+
+```bash
+rugular generate route test:<route_name>
+```
+
 #### Create a Directive
 
 ```bash
@@ -109,6 +117,13 @@ This command will create a directive and controller namespaced with a new
 module of the feature name if one does not already exist. It will also register
 the new module in the ``app.module.js`` file.
 
+Directives can be nested in another folder representing a module like routes.
+For example, to nest a directive inside a pre-existing 'test' module, execute:
+
+```bash
+rugular generate directive test:<directive_name>
+```
+
 #### Create a Factory (TODO)
 
 ```bash
@@ -125,7 +140,6 @@ A component refers to shareable, abstracted angular modules. To create a
 component, simply run any generator command with the ``-c`` option and the
 service will be created in the ``src/components`` folder.
 
-
 ## Running the Test Suite
 
 To run the test suite just once (such as in a continuous environment) execute:

data/circle.yml

@@ -0,0 +1,3 @@
+test:
+  override:
+    - bundle exec rake

data/features/continuous_integration.feature

@@ -5,11 +5,4 @@ Feature: Rugular CLI
 
   Scenario: Running the tests for continuous integration
     When I set up Rugular with dependencies and run "rugular ci"
-    Then the file "my-app/.tmp/index.html" should contain:
-    """
-    ng-app
-    """
-    And the file "my-app/.tmp/app/app.module.js" should contain:
-    """
-    angular.module
-    """
+    Then the exit status should not be 1

data/features/generator_for_route.feature

@@ -5,7 +5,7 @@ Feature: Rugular CLI
 
   Scenario: Generating a route
     When I set up Rugular and run "rugular generate route test"
-    And the file "my-app/src/app/test/test.controller.coffee" should contain:
+    Then the file "my-app/src/app/test/test.controller.coffee" should contain:
       """
       angular.module('test').controller('testController', testController)
       """
@@ -31,10 +31,58 @@ Feature: Rugular CLI
         'ui.router'
       ]
       """
+    And a file named "my-app/src/app/test/_test.sass" should exist
+    And the file "my-app/src/application.sass" should contain:
+      """
+      @import 'app/test'
+      """
 
   Scenario: Generating a route in the components directory
     When I set up Rugular and run "rugular generate route -c test"
-    And the file "my-app/src/components/test/test.controller.coffee" should contain:
+    Then the file "my-app/src/components/test/test.controller.coffee" should contain:
       """
       angular.module('test').controller('testController', testController)
       """
+
+  Scenario: Generating a multiple word route
+    When I set up Rugular and run "rugular generate route credit_card"
+    Then the file "my-app/src/app/credit_card/credit_card.controller.coffee" should contain:
+      """
+      angular.module('creditCard').controller('creditCardController', creditCardController)
+      """
+
+  Scenario: Generating a nested route
+    When I set up Rugular and run "rugular generate route profile; rugular generate route profile:address"
+    Then the file "my-app/src/app/profile/address/address.controller.coffee" should contain:
+      """
+      angular.module('address').controller('addressController', addressController)
+      """
+    And the file "my-app/src/app/profile/address/address.routes.coffee" should contain:
+      """
+      angular.module('address').config(addressRouting)
+      """
+    And the file "my-app/src/app/profile/profile.module.coffee" should contain:
+      """
+      'address'
+      """
+    And the file "my-app/src/app/profile/address/address.module.coffee" should contain:
+      """
+      angular.module 'address', [
+        'ui.router'
+      ]
+      """
+
+  Scenario: Generating a doubly nested route
+    When I set up Rugular and run "rugular generate route profile; rugular generate route profile:address; rugular generate route profile:address:zip_code"
+    Then the file "my-app/src/app/profile/address/zip_code/zip_code.controller.coffee" should contain:
+      """
+      angular.module('zipCode').controller('zipCodeController', zipCodeController)
+      """
+    And the file "my-app/src/app/profile/address/zip_code/zip_code.routes.coffee" should contain:
+      """
+      angular.module('zipCode').config(zipCodeRouting)
+      """
+    And the file "my-app/src/app/profile/address/address.module.coffee" should contain:
+      """
+      'zipCode'
+      """

data/features/new.feature

@@ -6,7 +6,7 @@ Feature: Rugular CLI
   Scenario: New
     When I run `rugular new my-app`
     Then the exit status should be 0
-    Then the file "my-app/.gitignore" should contain:
+    And the file "my-app/.gitignore" should contain:
       """
       bower_components
       """
@@ -24,6 +24,9 @@ Feature: Rugular CLI
       """
     And the file "my-app/src/index.haml" should contain:
       """
-      = javascript_include_tag("./bower_components/angular-ui-router/release/angular-ui-router.js")
+      %link(href='application.css', media='screen', rel='stylesheet')
       """
+    And a directory named "my-app/src/components" should exist
+    And a file named "my-app/src/application.sass" should exist
+    And the output should contain "Thank you for installing Rugular"
 

data/lib/rugular/tasks/continuous_integration.rb

@@ -5,29 +5,20 @@ module Rugular
   class ContinuousIntegration < Thor::Group
     include Thor::Actions
 
-    desc('runs the tests once for continuous integration')
-
-    def compile_to_tmp_folder(folder: Pathname.new(".tmp"))
-      compile_coffescript_files(folder)
-
-      complie_sass_files(folder)
-
-      compile_haml_files(folder)
+    def self.exit_on_failure?
+      true
     end
 
+    desc('runs the tests once for continuous integration')
+
     def run_karma_script
       system(
         "./node_modules/karma/bin/karma start "\
         "--single-run --no-auto-watch karma.conf.js"
       )
-
-      return false unless $?.exitstatus == 0
-    end
-
-    def completed_tests
-      puts "Your tests have passed!!"
     end
 
+    private
     # TODO: this requires a selenium driver, such as sauce labs.
     # http://stackoverflow.com/questions/23150585/getting-started-with-protractor-travis-and-saucelabs
     # def run_protractor_script
@@ -40,52 +31,5 @@ module Rugular
     #
     #   return false unless $?.exitstatus == 0
     # end
-
-    private
-
-    def compile_coffescript_files(folder)
-      src_coffeescript_files.each do |file|
-        create_file file.to_s.gsub('./src/', './.tmp/').gsub('coffee', 'js') do
-          CoffeeScript.compile(file)
-        end
-      end
-    end
-
-    def compile_haml_files(folder)
-      src_haml_files.each do |file|
-        create_file file.to_s.gsub('./src/', './.tmp/').gsub('haml', 'html') do
-          HamlRenderer.render(file)
-        end
-      end
-    end
-
-    def complie_sass_files(folder)
-      src_sass_files.each do |file|
-        create_file file.to_s.gsub('./src/', './.tmp/').gsub('sass', 'css') do
-          begin
-            Sass::Engine.new(file.read, load_paths: ["./."]).to_css
-          rescue StandardError => e
-            puts "!!! SASS Error: " + e.message
-          end
-        end
-      end
-    end
-
-    def src_coffeescript_files
-      Dir.glob("./src/**/*.coffee").map(&transform_to_pathname)
-    end
-
-    def src_haml_files
-      Dir.glob("./src/**/*.haml").map(&transform_to_pathname)
-    end
-
-    def src_sass_files
-      Dir.glob("./src/**/*.sass").map(&transform_to_pathname)
-    end
-
-    def transform_to_pathname
-      ->(file_name) { Pathname.new(file_name) }
-    end
-
   end
 end

data/lib/rugular/tasks/generate.rb

@@ -1,5 +1,4 @@
-Dir.glob("#{__dir__}/helpers/**/*.rb").each {|file| require file}
-Dir.glob("#{__dir__}/generate/**/*.rb").each {|file| require file}
+Dir.glob("#{__dir__}/{helpers,generate}/**/*.rb").each {|file| require file}
 
 module Rugular
   class Generate < Thor
@@ -18,7 +17,6 @@ module Rugular
       The angular services this command can create include:
 
       * A route (includes a route, controller, controller_spec and view)
-      * A controller
       * A factory
       * A directive (includes a view)
 

data/lib/rugular/tasks/generate/generator_base.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'active_support'
 
 module Rugular
   class GeneratorBase < Thor::Group
@@ -6,7 +7,6 @@ module Rugular
 
     argument :name, desc: 'Name for your route'
 
-    # specify a component
     class_option(
       :c,
       type: :boolean,
@@ -31,38 +31,57 @@ module Rugular
       end
     end
 
-    def inject_module_into_app_module
-      insert_into_file(
-        app_module_file,
-        module_declaration,
-        after: "angular.module 'app', [\n"
-      ) unless module_declaration_present?
+    def inject_module_into_module
+      if nested?
+        insert_into_file(
+          nested_module_file,
+          module_declaration,
+          after: "angular.module '#{nested_module_name}', [\n"
+        ) unless module_declaration_present?(nested_module_file)
+      else
+        insert_into_file(
+          app_module_file,
+          module_declaration,
+          after: "angular.module 'app', [\n"
+        ) unless module_declaration_present?(app_module_file)
+      end
+    end
+
+    def add_sass_declaration
+      append_to_file(
+        'src/application.sass',
+        "@import '#{folder.sub('src/', '')}'"
+      ) unless sass_declaration_present?(folder)
     end
 
     def template_files; []; end
 
     protected
 
-    def folder
-      options[:c] ? "src/components/#{name}" : "src/app/#{name}"
+    def lib_directory
+      __dir__.chomp('tasks/generate')
     end
 
     def route_pathnames
-      Dir.glob(template_files).map do |file_name|
-        Pathname.new(file_name)
+      Dir.glob(template_files).map do |filename|
+        Pathname.new(filename)
       end
     end
 
+    def folder
+      options[:c] ? "src/components/#{name_folder}" : "src/app/#{name_folder}"
+    end
+
     def destination_file(pathname)
-      "#{folder}/#{pathname.basename('.erb').to_s.gsub('app', name)}"
+      "#{folder}/#{pathname.basename('.erb').to_s.gsub('app', name.split(':').last)}"
     end
 
-    def open_struct
-      @_open_struct ||= OpenStruct.new(name: name)
+    def camelcase_name
+      name.split(':').last.camelcase(:lower)
     end
 
-    def lib_directory
-      __dir__.chomp('/tasks/generate')
+    def open_struct
+      @_open_struct ||= OpenStruct.new(name: camelcase_name)
     end
 
     def app_module_file
@@ -70,12 +89,36 @@ module Rugular
     end
 
     def module_declaration
-      "  '#{name}'\n"
+      "  '#{camelcase_name}'\n"
     end
 
-    def module_declaration_present?
-      File.read(app_module_file).include? module_declaration
+    def module_declaration_present?(module_file)
+      File.read(module_file).include? module_declaration
     end
 
+    def sass_declaration_present?(folder)
+      File.read("src/application.sass").include?  "@import #{folder}"
+    end
+
+    def nested?
+      name.split(':').length > 1
+    end
+
+    def name_folder
+      name.split(':').join('/')
+    end
+
+    def nested_module_name
+      name.split(':')[-2]
+    end
+
+    def nested_module_file
+      "src/#{app_or_component}/#{name.split(':')[0..-2].join('/')}/"\
+        "#{nested_module_name}.module.coffee"
+    end
+
+    def app_or_component
+      options[:c] ? 'components' : 'app'
+    end
   end
 end

data/lib/rugular/tasks/new.rb

@@ -29,13 +29,15 @@ module Rugular
     end
 
     def create_component_directory
-      empty_directory "#{app_name}/components"
+      empty_directory "#{app_name}/src/components"
     end
 
     def installation_complete
       puts "Thank you for installing Rugular, please finish setting up your "\
         "project with: `cd #{app_open_struct.name} && bundle install && "\
-        "rugular dependencies`"
+        "rugular dependencies`\n"\
+        "Please install bourbon and neat by bundle exec bourbon install "\
+        "--path src/ and neat with bundle exec neat install --path src/"
     end
 
     private

data/lib/rugular/tasks/server/Guardfile

@@ -1,22 +1,6 @@
-# Only watch the src folder
+require "#{__dir__}/guards/rugular.rb"
 directories %w(src)
 
-# Create .tmp folder for localhost server and karma
-['haml', 'sass'].each do |language|
-  guard language, input: 'src', output: '.tmp', run_at_start: true do
-    watch %r{^src/.+\.#{language}}
-  end
-end
-
-
-input_dir = 'src'
-
-coffeescript_options = {
-  input: input_dir,
-  output: '.tmp',
-  patterns: [%r{^#{input_dir}/(.+\.(?:coffee|coffee\.md|litcoffee))$}]
-}
-
-guard 'coffeescript', coffeescript_options do
-  coffeescript_options[:patterns].each { |pattern| watch(pattern) }
+guard :rugular do
+  watch /^.+.[^sass]/
 end

data/lib/rugular/tasks/server/Procfile

@@ -1,5 +1,6 @@
-web: ruby -run -e httpd .tmp --port 8080 &> /dev/null
+web: ruby -run -e httpd dist --port 8080 &> /dev/null
 guard: bundle exec guard --guardfile=$(bundle show rugular)/lib/rugular/tasks/server/Guardfile
-karma: ./node_modules/karma/bin/karma start karma.conf
+sass: sass --watch src/application.css:dist/application.css
 selenium: webdriver-manager start &> /dev/null
+karma: ./node_modules/karma/bin/karma start karma.conf
 

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

@@ -0,0 +1,17 @@
+require 'guard'
+require 'guard/plugin'
+
+module Guard
+  class RugularCoffeeScript < Plugin
+    def start; true end
+    def stop; true end
+    def reload; true end
+    def run_all
+      CoffeeScript.compile
+
+    end
+
+    def run_on_change
+    end
+  end
+end

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

@@ -0,0 +1,140 @@
+require 'guard/compat/plugin'
+require 'haml'
+require 'coffee_script'
+require 'uglifier'
+
+module Guard
+  class Rugular < Plugin
+
+    def initialize(opts = {})
+      super(opts)
+    end
+
+    def start; true end
+    def stop; true end
+    def reload; true end
+
+    def run_all
+      run_on_changes('src/app/app.coffee')
+    end
+
+    def run_on_changes(paths)
+      paths.each do |file|
+        ::Guard::UI.info "Guard received save event for #{file}"
+
+        case file.split('.').last
+        when 'haml'   then message = compile_haml(file)
+        when 'coffee' then message = compile_coffee(file)
+        when 'yaml'   then message = compile_yaml
+        end
+
+        ::Guard::UI.info message
+      end
+    end
+
+    def run_on_removals(paths)
+      run_on_changes(paths)
+    end
+
+    private
+
+    def compile_haml(file)
+      html = ::Haml::Engine.new(File.read(file)).render
+
+      if file == 'src/index.html'
+        File.open('dist/index.html', 'w') do |file|
+          file.write = html
+        end
+      else
+        compile_coffee('src/app/app.module.coffee')
+      end
+
+      message = "Successfully compiled #{file} to html!\n"
+    rescue StandardError => error
+      handle_error_in_guard(error)
+    end
+
+    def compile_coffee(file)
+      CoffeeScript.compile(file)
+
+      File.open('dist/application.js', 'w') do |file|
+        file.write(
+          Uglifier.compile(
+            CoffeeScript.compile(
+              javascript_files.map { |e| File.read(e) }.join,
+            ).gsub('templateUrl', 'template'),
+            comments: false
+          )
+        )
+      end
+
+      # Inline templates into javascript
+      (Dir.glob("**/*.haml") - ["src/index.haml"]).each do |haml_file|
+        html = ::Haml::Engine.new(File.read(haml_file), {}).render
+        haml_file.gsub!('src/', '').gsub!('haml', 'html')
+        IO.write('dist/application.js', File.open('dist/application.js') do |f|
+          f.read.gsub(haml_file, html)
+        end)
+      end
+
+      message = "Successfully compiled #{file} to js!\n"
+    rescue StandardError => error
+      handle_error_in_guard(error)
+    end
+
+    def compile_yaml
+      File.open("dist/bower_components.css", 'w') do |file|
+        file.write bower_css
+      end
+      File.open("dist/bower_components.js", 'w') do |file|
+        file.write Uglifier.compile(bower_javascript)
+      end
+
+      message = 'Successfully created bower_component dist files'
+    rescue StandardError => error
+      handle_error_in_guard(error)
+    end
+
+    def bower_css
+      bower_yaml.fetch('css').map do |filename|
+        File.read('bower_components/' + filename)
+      end.join
+    end
+
+    def bower_javascript
+      bower_yaml.fetch('js').map do |filename|
+        File.read('bower_components/' + filename)
+      end.join
+    end
+
+    def bower_yaml
+      YAML.load(File.read('src/bower_components.yaml'))
+    end
+
+    def handle_error_in_guard(error)
+      message = "#{error.message}"
+      ::Guard::UI.error message
+      throw :task_has_failed
+    end
+
+    def javascript_files
+      Dir.glob("**/*.module.coffee").sort(&reverse_nested) +
+        Dir.glob("**/*.routes.coffee").sort(&reverse_nested) +
+        Dir.glob("**/*.factory.coffee").sort(&reverse_nested) +
+        Dir.glob("**/*.controller.coffee").sort(&reverse_nested) +
+        Dir.glob("**/*.directive.coffee").sort(&reverse_nested)
+    end
+
+    def reverse_nested
+      lambda do |x, y|
+        x.scan('/').length <=> y.scan('/').length
+      end
+    end
+
+    def sass_engine
+      @_sass_engine ||= Sass::Engine
+    end
+
+  end
+end
+

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

@@ -0,0 +1,21 @@
+require 'guard'
+require 'guard/plugin'
+
+module Guard
+  class RugularSass < Plugin
+    def initialize(opts = {})
+    end
+
+    def start; true end
+    def stop; true end
+    def reload; true end
+    def run_all
+
+    end
+
+    def run_on_change
+
+    end
+  end
+end
+

data/lib/rugular/templates/new/.gitignore

@@ -1,7 +1,6 @@
 .sass-cache
 .tmp
+dist
 
 bower_components
 node_modules
-dist
-src/**/*.js

data/lib/rugular/templates/new/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
 gem 'rugular'
-gem 'guard-coffeescript', github: 'guard/guard-coffeescript', branch: 'master'
-gem 'guard-haml', github: 'shicholas/guard-haml'

data/lib/rugular/templates/new/karma.conf.js

@@ -6,6 +6,22 @@ module.exports = function (config) {
 
     frameworks: ['mocha', 'chai', 'sinon', 'chai-sinon'],
 
+    preprocessors: {
+      '**/*.coffee': ['coffee']
+    },
+
+    coffeePreprocessor: {
+      // options passed to the coffee compiler
+      options: {
+        bare: true,
+        sourceMap: false
+      },
+      // transforming the filenames
+      transformPath: function(path) {
+        return path.replace(/\.coffee$/, '.js');
+      }
+    },
+
     // list of files / patterns to load in the browser
     files: [
       './test/*.js',
@@ -13,13 +29,13 @@ module.exports = function (config) {
       './bower_components/angular/angular.js',
       './bower_components/angular-ui-router/release/angular-ui-router.js',
       './bower_components/angular-mocks/angular-mocks.js',
-      './bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
 
-      '.tmp/**/*.module.js',
-      '.tmp/**/*.routes.js',
-      '.tmp/**/*.controller.js',
-      '.tmp/**/*.directive.js',
-      '.tmp/**/*.spec.js'
+      'src/**/*.module.coffee',
+      'src/**/*.routes.coffee',
+      'src/**/*.factory.coffee',
+      'src/**/*.controller.coffee',
+      'src/**/*.directive.coffee',
+      'src/**/*.spec.coffee'
     ],
 
     // web server port
@@ -33,15 +49,12 @@ module.exports = function (config) {
     // config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
 
-    // enable / disable watching file and executing tests whenever any file changes
+    // watch file and execute tests whenever any file changes
     autoWatch: true,
 
-    // start these browsers
-    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    // browsers: ['Chrome', 'ChromeCanary', 'FirefoxAurora', 'Safari', 'PhantomJS'],
+    // other available browsers: ['Chrome', 'Firefox', 'Safari', 'PhantomJS'],
     browsers: ['PhantomJS'],
 
-    // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: false
   });

data/lib/rugular/templates/new/src/application.sass

@@ -0,0 +1,4 @@
+// This is the only file that will be compiled by rugular. Please ensure that
+// all of the top level sass files in both the app and components folder are
+// imported into this one
+@import 'app/app'

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

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

data/lib/rugular/templates/new/src/index.haml

@@ -1,33 +1,18 @@
 !!!
-%html{"ng-app" => "app"}
+%html{'ng-app' => 'app'}
   %head
     %title Hello
 
-    -# <!--[if lte IE 8]>
-    -#   <script type="text/javascript">
-    -#     // define our custom directives here
-    -#     window.myCustomTags = ['myDirective'];
-    -#   </script>
-    -#   <script src="lib/angular-ui-ieshiv.js"></script>
-    -# <![endif]-->
+    -# add a list of bower css and javascript files you wish to include in the
+    -# bower_components.yml file
 
-    /it is recommended to cherry pick which bower components you want
-    = stylesheet_link_tag("./bower_components/bootstrap/dist/css/bootstrap.min.css")
-    = stylesheet_link_tag("./bower_components/font-awesome/css/font-awesome.min.css")
-    = stylesheet_link_tag(*Dir.glob(".tmp/app/**/*.css"))
-    = stylesheet_link_tag(*Dir.glob(".tmp/components/**/*.css"))
+    %link(href='bower_components.css', media='screen', rel='stylesheet')
+    %link(href='application.css', media='screen', rel='stylesheet')
 
   %body
-    /[f lt IE 9] <a href='lthttp://browsehappy.com/'> You are using an out of date browser; this is very dangerous. I strongly urge you to update today.</a>
+    /[f lt IE 9] <a href='http://browsehappy.com/'> You are using an out of date browser; this is very dangerous. I strongly urge you to update today.</a>
 
     %ui-view
 
-    /it is recommended to cherry pick which bower components you want
-    = javascript_include_tag("./bower_components/angular/angular.js")
-    = javascript_include_tag("./bower_components/angular-ui-router/release/angular-ui-router.js")
-
-    = javascript_include_tag(*Dir.glob(".tmp/**/*.module.js"))
-    = javascript_include_tag(*Dir.glob(".tmp/**/*.routes.js"))
-    = javascript_include_tag(*Dir.glob(".tmp/**/*.factory.js"))
-    = javascript_include_tag(*Dir.glob(".tmp/**/*.controller.js"))
-    = javascript_include_tag(*Dir.glob(".tmp/**/*.directive.js"))
+    %script(src='bower_components.js')
+    %script(src='application.js')

data/lib/rugular/templates/new_erb/bower.json.erb

@@ -19,11 +19,12 @@
   "dependencies": {
     "angular": "~1.2",
     "angular-sanitize": "~1.2",
-    "bootstrap": "~3.2.0",
-    "font-awesome": "~4.2.0",
-    "moment": "~2.6.0",
-    "angular-ui-router": "~0.2.12",
-    "toastr": "~2.1.0",
-    "angular-animate": "~1.2"
+    "angular-animate": "~1.2",
+    "font-awesome": "*",
+    "moment": "*",
+    "angular-ui-router": "*",
+    "toastr": "*",
+    "bourbon": "*",
+    "neat": "*"
   }
 }

data/lib/rugular/templates/new_erb/package.json.erb

@@ -12,6 +12,7 @@
     "karma": "*",
     "karma-chai": "*",
     "karma-chai-sinon": "*",
+    "karma-coffee-preprocessor": "*",
     "karma-chrome-launcher": "*",
     "karma-coverage": "*",
     "karma-firefox-launcher": "*",

data/lib/rugular/templates/route/app.routes.coffee.erb

@@ -1,6 +1,4 @@
-<%= name %>Routing = ($stateProvider, $urlRouterProvider) ->
-  $urlRouterProvider.otherwise('/')
-
+<%= name %>Routing = ($stateProvider) ->
   $stateProvider.state '<%= name %>',
     url: '/<%= name %>'
     templateUrl: '/app/<%= name %>/<%= name %>.html'
@@ -9,7 +7,7 @@
 
   return
 
-<%= name %>Routing.$inject = ['$stateProvider', '$urlRouterProvider']
+<%= name %>Routing.$inject = ['$stateProvider']
 
 angular.module('<%= name %>').config(<%= name %>Routing)
 

data/lib/rugular/version.rb

@@ -1,3 +1,3 @@
 module Rugular
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

data/rugular.gemspec

@@ -17,16 +17,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'actionview',         '~> 4'
-  spec.add_runtime_dependency 'guard',              '~> 2'
-  # spec.add_runtime_dependency 'guard-coffeescript', '~> 2'
-  spec.add_runtime_dependency 'haml',               '~> 4'
-  spec.add_runtime_dependency 'sass',               '~> 3'
-  spec.add_runtime_dependency 'guard-sass',         '~> 1'
-  spec.add_runtime_dependency 'foreman',            '~> 0'
-  spec.add_runtime_dependency 'therubyracer',       '~> 0'
-  spec.add_runtime_dependency 'thor',               '~> 0'
-  spec.add_runtime_dependency 'uglifier',           '~> 2'
+  spec.add_runtime_dependency 'actionview',    '~> 4'
+  spec.add_runtime_dependency 'guard',         '~> 2'
+  spec.add_runtime_dependency 'guard-compat',  '~> 1'
+  spec.add_runtime_dependency 'coffee-script', '~> 2'
+  spec.add_runtime_dependency 'haml',          '~> 4'
+  spec.add_runtime_dependency 'sass',          '~> 3'
+  spec.add_runtime_dependency 'uglifier',      '~> 2'
+  spec.add_runtime_dependency 'foreman',       '~> 0'
+  spec.add_runtime_dependency 'thor',          '~> 0'
+  spec.add_runtime_dependency 'bourbon',       '~> 4'
+  spec.add_runtime_dependency 'neat',          '~> 1'
 
   spec.add_development_dependency 'aruba',  '~> 0'
   spec.add_development_dependency 'byebug', '~> 3'

metadata

@@ -1,195 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: rugular
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Nicholas Shook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: guard-compat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: guard-sass
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: bourbon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: neat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: aruba
   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'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 description: 
@@ -200,12 +228,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
 - bin/rugular
+- circle.yml
 - features/continuous_integration.feature
 - features/generator_for_directive.feature
 - features/generator_for_route.feature
@@ -226,11 +255,14 @@ files:
 - lib/rugular/tasks/server.rb
 - lib/rugular/tasks/server/Guardfile
 - lib/rugular/tasks/server/Procfile
+- lib/rugular/tasks/server/guards/coffee.rb
+- lib/rugular/tasks/server/guards/rugular.rb
+- lib/rugular/tasks/server/guards/sass.rb
+- lib/rugular/templates/directive/_app.sass.erb
 - lib/rugular/templates/directive/app.directive.coffee.erb
 - lib/rugular/templates/directive/app.directive.spec.coffee.erb
 - lib/rugular/templates/directive/app.haml.erb
 - lib/rugular/templates/directive/app.module.coffee.erb
-- lib/rugular/templates/directive/app.sass.erb
 - lib/rugular/templates/new/.gitignore
 - lib/rugular/templates/new/Gemfile
 - lib/rugular/templates/new/e2e/app_spec.coffee
@@ -242,17 +274,19 @@ files:
 - lib/rugular/templates/new/src/app/app.module.coffee
 - lib/rugular/templates/new/src/app/app.routes.coffee
 - lib/rugular/templates/new/src/app/app.sass
+- lib/rugular/templates/new/src/application.sass
+- lib/rugular/templates/new/src/bower_components.yaml
 - lib/rugular/templates/new/src/favicon.ico
 - lib/rugular/templates/new/src/index.haml
 - lib/rugular/templates/new/test/spec_helper.js
 - lib/rugular/templates/new_erb/bower.json.erb
 - lib/rugular/templates/new_erb/package.json.erb
+- lib/rugular/templates/route/_app.sass.erb
 - lib/rugular/templates/route/app.controller.coffee.erb
 - lib/rugular/templates/route/app.controller.spec.coffee.erb
 - lib/rugular/templates/route/app.haml.erb
 - lib/rugular/templates/route/app.module.coffee.erb
 - lib/rugular/templates/route/app.routes.coffee.erb
-- lib/rugular/templates/route/app.sass.erb
 - lib/rugular/version.rb
 - rugular.gemspec
 homepage: http://rugular.info
@@ -265,17 +299,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rugular - a ruby scaffolding framework for AngularJS

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - '2.1.5'
-