rugular 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b661257869943d3c3ba6d55ac60aaa4cc493773
-  data.tar.gz: bfc45cbb2a2866fcb1c26425cac8559df07cbccb
+  metadata.gz: 828aaed71855c15f785eb94c3fbcba03b8f81476
+  data.tar.gz: 242c83fa177fedf08d8fe221567b074c7e3de17d
 SHA512:
-  metadata.gz: 196a806a90c613a31a87aa33b9137880d6ea8200d10675ba1b147eec25c14502bc79032728382161e29beca134ca21b6b97a47f0fa3ba936a491ac2787d6a64b
-  data.tar.gz: c4a7a901c97c9415b226eedf52c8e437d612ee5846961ef202cea842fa235afc9ee6df86412bfc5044f3c0fc614db2ff75b12d2905cb56b75a87427e31afefb8
+  metadata.gz: 12fdf2ee6b6303683fa9e90e64d2b27e577e21f2bfc0d3549d15dd7755c5d420ba474ae69292a47f2a069c00a65926c502a128fe7072269d51240a155f890bd1
+  data.tar.gz: 9477c521894ca6bcc5a02524fa24615fd5ba11fb283ee628e3ffc87522ac4c61fb0ffb7cf1cc01f8f7f20343d354c239479e5d675187b6b2590880f46ed7eb65

data/lib/rugular/tasks/build.rb

@@ -96,18 +96,18 @@ module Rugular
     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")
+      Dir.glob("src/components/**/*.module.coffee").sort(&reverse_nested) +
+        Dir.glob("src/components/**/*.factory.coffee").sort(&reverse_nested) +
+        Dir.glob("src/components/**/*.filter.coffee").sort(&reverse_nested) +
+        Dir.glob("src/components/**/*.controller.coffee").sort(&reverse_nested) +
+        Dir.glob("src/components/**/*.directive.coffee").sort(&reverse_nested) +
+        Dir.glob("src/components/**/*.routes.coffee").sort(&reverse_nested) +
+        Dir.glob("src/app/**/*.module.coffee").sort(&reverse_nested) +
+        Dir.glob("src/app/**/*.factory.coffee").sort(&reverse_nested) +
+        Dir.glob("src/app/**/*.filter.coffee").sort(&reverse_nested) +
+        Dir.glob("src/app/**/*.controller.coffee").sort(&reverse_nested) +
+        Dir.glob("src/app/**/*.directive.coffee").sort(&reverse_nested) +
+        Dir.glob("src/app/**/*.routes.coffee").sort(&reverse_nested)
     end
 
     def bower_css
@@ -124,5 +124,11 @@ module Rugular
     def lib_directory
       __dir__.chomp('tasks')
     end
+
+    def reverse_nested
+      lambda do |x, y|
+        x.scan('/').length <=> y.scan('/').length
+      end
+    end
   end
 end

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

@@ -32,6 +32,7 @@ module Rugular
     end
 
     def inject_module_into_module
+      return if component?
       if nested?
         insert_into_file(
           nested_module_file,
@@ -109,5 +110,9 @@ module Rugular
     def app_or_component
       options[:c] ? 'components' : 'app'
     end
+
+    def component?
+      app_or_component == 'components'
+    end
   end
 end

data/lib/rugular/version.rb

@@ -1,3 +1,3 @@
 module Rugular
-  VERSION = '0.5.4'
+  VERSION = '0.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rugular
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Nicholas Shook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview