rugular 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 760689401011b12fb7cdaf5ad0ef46ceee2ecc1b
-  data.tar.gz: 365708444880c8c3276b591863af6c88a31024cb
+  metadata.gz: 9984dbdfd23f8ca2e33329b9a885207a4995b305
+  data.tar.gz: a715174ffa8e23b19ea7dbf202076bcecd794852
 SHA512:
-  metadata.gz: 80751032aefa055f466621e9235947db0db1a2c95f415f93fb913853c91fdac14f86537564e95f394c1eab2d43547dfd676ec665af5407529d648f6cb2132d93
-  data.tar.gz: 6f1c8e2fdff3f7a62018b67ce8651bb7ec8661b4f74d62b1753b98ead164a2d50266ba8c1c6bcb43f9c24f0b9e585aacfaee58b7f3a6ea1122045d264d1e0483
+  metadata.gz: 29352b360c55f4147d32c6b07c500fe2a75903914a4497b4dad95360cee1a534585a10eaf02fce4289e34061f68641bbde664789860f70bc635d7073b4eb9eb1
+  data.tar.gz: 312329acdbf540b6381c7fc45f01136a5f3d46e51ff05945cca39206c75e247394a8981952d97f520a7677d7e9f600d40f90108c4946c9622cc215401c84c718

data/README.md

@@ -334,7 +334,8 @@ This will create the following files:
 
 Features coming soon:
 
-* Abstracting bower components from a folder and its subfolders
+* Abstracting a bower component from a either the ``components`` folder or both
+  the ``components`` and ``app`` folder as one component.
 * Fingerprinting dist asset files for caching
 * Nginx based docker container for deploying apps
 
@@ -342,11 +343,11 @@ As soon as it reaches a stable release:
 
 * ``angular-ui-router`` will be replaced by the ``router`` re-write by the
   Angular team.
-* Angular 1.3 will be updated to Angular 1.4
+* Angular 1.3 will be updated to Angular 1.4 (then to 1.5)
 
 Post Angular 2.0 changes
 
-* replace CoffeeScript with EcmaScript6
+* replace CoffeeScript with Typescript
 * replace the folder structure and build scripts to take advantage of
   EcmaScript 6 modules
 

data/bower.json

@@ -6,9 +6,6 @@
   ],
   "description": "yes",
   "main": "okay.js",
-  "moduleType": [
-    "es6"
-  ],
   "keywords": [
     "yes"
   ],

data/features/abstract.feature

@@ -4,13 +4,20 @@ Feature: Rugular CLI
   As a user of the rugular framework
   I want to create a bower_component from any component folder
 
-  Scenario: Abstract
-    When I set up Rugular and run "rugular g directive test"
-    And I run `cd tmp/aruba/my-app && rugular abstract test` interactively
-    And I type 'yes'
-    Then the file "~/bower_components/test/bower.json" should contain:
-    """
-    "private": true,
-    """
-
-
+  # Scenario: Abstracting components folder
+  #   When I set up Rugular and run "rugular g directive test"
+  #   And I run `cd tmp/aruba/my-app && rugular abstract -c`
+  #   Then the file "~/bower_components/myapp/bower.json" should contain:
+  #   """
+  #   "private": true,
+  #   """
+  #
+  # Scenario: Abstracting both the app and components folder
+  #   When I set up Rugular and run "rugular g directive test"
+  #   And I run `cd tmp/aruba/my-app && rugular abstract`
+  #   Then the file "~/bower_components/myapp/bower.json" should contain:
+  #   """
+  #   "private": true,
+  #   """
+  #
+  #

data/lib/rugular/tasks/abstract.rb

@@ -21,10 +21,8 @@ module Rugular
       )
     end
 
-    def ask_for_version
-      @version = ask(
-        "the previous version is #{previous_version}, what is the version now?"
-      )
+    def initialize_or_create_version
+
     end
 
     def file_copy_folder_into_bower_src_folder

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

@@ -1,17 +1,17 @@
 module Rugular
   class JavascriptFiles
     def self.ordered_array
-      Dir.glob('src/components/**/*.module.{coffee,es6}') +
-        Dir.glob('src/components/**/*.constant.{coffee,es6}') +
-        Dir.glob('src/components/**/*.factory.{coffee,es6}') +
-        Dir.glob('src/components/**/*.filter.{coffee,es6}') +
-        Dir.glob('src/components/**/*.controller.{coffee,es6}') +
-        Dir.glob('src/components/**/*.directive.{coffee,es6}') +
-        Dir.glob('src/app/**/*.module.{coffee,es6}') +
-        Dir.glob('src/app/**/*.config.{coffee,es6}') +
-        Dir.glob('src/app/**/*.constant.{coffee,es6}') +
-        Dir.glob('src/app/**/*.controller.{coffee,es6}') +
-        Dir.glob('src/app/**/*.routes.{coffee,es6}')
+      Dir.glob('src/components/**/*.module.coffee') +
+        Dir.glob('src/components/**/*.constant.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/app/**/*.module.coffee') +
+        Dir.glob('src/app/**/*.config.coffee') +
+        Dir.glob('src/app/**/*.constant.coffee') +
+        Dir.glob('src/app/**/*.controller.coffee') +
+        Dir.glob('src/app/**/*.routes.coffee')
     end
   end
 end

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

@@ -2,7 +2,6 @@ require 'guard'
 require_relative 'rugular_assets'
 require_relative 'rugular_bower_components'
 require_relative 'rugular_coffee'
-require_relative 'rugular_es6'
 require_relative 'rugular_haml'
 require_relative 'rugular_index_html'
 
@@ -32,7 +31,6 @@ module Guard
       [*paths].each do |file|
         message =
           case File.extname(file)
-          when '.es6'    then ::RugularES6.compile(file)
           when '.coffee' then ::RugularCoffee.compile(file)
           when '.haml'   then ::RugularHaml.compile(file)
           when '.yaml'   then ::RugularBowerComponents.compile
@@ -57,7 +55,6 @@ module Guard
 
         message =
           case File.extname(file)
-          when '.es6'    then ::RugularES6.delete(file)
           when '.coffee' then ::RugularCoffee.delete(file)
           when '.haml'   then ::RugularHaml.delete(file)
           when '.yaml'   then fail "Please restore #{file}"

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

@@ -35,7 +35,7 @@ class RugularIndexHtml
 
   def convert_to_script_tag
     lambda do |javascript_file|
-      tmp_filename = javascript_file.gsub('src', '').gsub(/coffee|es6/, 'js')
+      tmp_filename = javascript_file.gsub('src', '').gsub('coffee', 'js')
 
       Nokogiri::XML::Node.new 'script', application_html do |node|
         node['src'] = tmp_filename

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

@@ -6,9 +6,6 @@
   ],
   "description": "<%= description %>",
   "main": "<%= main_javascript_files %>",
-  "moduleType": [
-    "es6"
-  ],
   "keywords": [
     "yes"
   ],

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

@@ -1,5 +1,6 @@
 css:
   - 'font-awesome/css/font-awesome.min.css'
 js:
+  - 'jquery/dist/jquery.js'
   - 'angularjs-ie8-build/dist/angular.js'
   - 'angular-ui-router/release/angular-ui-router.js'

data/lib/rugular/templates/new/src/app/{app.controller.es6 → app.controller.coffee}

@@ -1,6 +1,5 @@
-AppController = function() {
-  this.title = 'App'
-}
+AppController = ->
+  @title = 'App'
 
 angular.module('app').controller('AppController', AppController)
 

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

@@ -1 +1,3 @@
 %h1 {{ app.title }}
+
+%div(ui-view)

data/lib/rugular/version.rb

@@ -1,3 +1,3 @@
 module Rugular
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rugular
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nicholas Shook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -339,7 +339,6 @@ files:
 - 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_es6.rb
 - lib/rugular/tasks/server/guards/rugular_haml.rb
 - lib/rugular/tasks/server/guards/rugular_index_html.rb
 - lib/rugular/tasks/tmux.rb
@@ -351,8 +350,8 @@ files:
 - 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/factory/app.factory.coffee
-- lib/rugular/templates/factory/app.module.coffee
+- lib/rugular/templates/factory/app.factory.coffee.erb
+- lib/rugular/templates/factory/app.module.coffee.erb
 - lib/rugular/templates/filter/app.filter.coffee.erb
 - lib/rugular/templates/filter/app.filter.spec.coffee.erb
 - lib/rugular/templates/filter/app.module.coffee.erb
@@ -364,7 +363,7 @@ files:
 - lib/rugular/templates/new/e2e/app_spec.coffee
 - lib/rugular/templates/new/karma.conf.js
 - lib/rugular/templates/new/protractor.conf.js
-- lib/rugular/templates/new/src/app/app.controller.es6
+- lib/rugular/templates/new/src/app/app.controller.coffee
 - lib/rugular/templates/new/src/app/app.controller.spec.coffee
 - lib/rugular/templates/new/src/app/app.haml
 - lib/rugular/templates/new/src/app/app.module.coffee

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

@@ -1,55 +0,0 @@
-require 'babel/transpiler'
-
-class RugularES6
-  def self.compile(es6_file)
-    new(es6_file).compile
-  end
-
-  def self.delete(es6_file)
-    new(es6_file).delete
-  end
-
-  def initialize(es6_file)
-    @es6_file = es6_file
-  end
-
-  def compile
-    write_tmp_file
-
-    "Successfully compiled #{es6_file} to js!\n"
-  end
-
-  def delete
-    FileUtils.rm(tmp_file)
-
-    "Sucessfully removed #{tmp_file}\n"
-  end
-
-  private
-
-  attr_reader :es6_file
-
-  def javascript
-    Babel::Transpiler.transform File.read(es6_file)
-  end
-
-  def tmp_file
-    es6_file.gsub('src', '.tmp').gsub('es6', 'js')
-  end
-
-  def write_tmp_file
-    create_tmp_folder
-
-    File.open(tmp_file, 'w', &write_javascript)
-  end
-
-  def create_tmp_folder
-    dirname = File.dirname(tmp_file)
-
-    FileUtils.mkdir_p(dirname) unless File.directory? dirname
-  end
-
-  def write_javascript
-    ->(file) { file.write javascript }
-  end
-end