technologist 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf836d500b3b397f7887b91fad2f4b36b421c46
-  data.tar.gz: 5a05188e267a135e6c98c1d3b51188a2c646833e
+  metadata.gz: 4bbc961282d2862ad3488cdf378e6d9b19b90cd3
+  data.tar.gz: 52243c0f99f97473f80e6b49d5f468bdd990ce19
 SHA512:
-  metadata.gz: 0fc8d41691e9660c430632f23c0bdc91af07d037d0499c47141566b610777f14fed340b1ac24a32365f83752ed790c45f700834a04a5608850d595d048d2e84f
-  data.tar.gz: b374785d7c9eed4fc899170633000fcdc3e2f82d6a2c57f564452df757bd05b2d87c6e68a3ac93eab4448ddc99d2b60e2e3218414861096cde47a08cb6f192d8
+  metadata.gz: e58a914c663a8104a3477ab5022896e53f552158c774638d06dfcee38493e8cdab531ae9beb75850c839cf1457b7d609ca697f2ff846be7a7c8f80396af8db9e
+  data.tar.gz: 232121c7c70e681fc83b2add66a60924b184873d1aaed57bc26bc29a713b49c987f7b5ad5b58851e1b9bc675028fe3ff350e2422af93413c4a1e7943321d5ff1

data/README.md

@@ -26,8 +26,9 @@ Or install it yourself as:
 require 'technologist'
 
 technologist = Technologist::Repository.new('.')
-technologist.primary_frameworks      # => ['Dashing']
-technologist.secondary_frameworks    # => ['Sinatra']
+technologist.primary_frameworks      # => ['Sinatra']
+technologist.secondary_frameworks    # => ['Dashing']
+technologist.frameworks              # => ['Sinatra', 'Dashing']
 ```
 
 ## Development
@@ -42,7 +43,7 @@ To add a framework definition add a new section to the
 [frameworks.yml](lib/technologist/frameworks.yml) file and
 add a new spec covering the new framework in [spec/frameworks_rules_spec.rb](spec/frameworks_rules_spec.rb)
 
-1. Fork it ( https://github.com/[my-github-username]/technologist/fork )
+1. Fork it ( https://github.com/koffeinfrei/technologist/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/technologist/framework_detector.rb

@@ -11,18 +11,24 @@ module Technologist
       @yaml_parser = YamlParser.new(FRAMEWORK_RULES)
     end
 
+    def frameworks
+      matched_frameworks.flat_map do |technology, definition|
+        [definition['primary'], technology]
+      end.compact.uniq
+    end
+
     def primary_frameworks
-      matched_frameworks.map do |technology|
+      matched_frameworks.map do |technology, definition|
         # it's either the primary value defined in the yaml
         # or the technology itself
-        yaml_parser.rules[technology]['primary'] || technology
+        definition['primary'] || technology
       end.uniq
     end
 
     def secondary_frameworks
-      matched_frameworks.map do |technology|
+      matched_frameworks.map do |technology, definition|
         # it's a secondary if a primary is defined in the yaml
-        yaml_parser.rules[technology]['primary'] && technology
+        definition['primary'] && technology
       end.compact
     end
 
@@ -31,13 +37,12 @@ module Technologist
     def matched_frameworks
       @frameworks ||=
         begin
-          yaml_parser.rules.map do |technology, definition|
-            definition['rules'].map do |rule|
-              if rule.matches?(repository)
-                technology
-              end
+          matched_rules = yaml_parser.rules.select do |technology, definition|
+            definition['rules'].any? do |rule|
+              rule.matches?(repository)
             end
-          end.flatten.compact
+          end
+          Hash[matched_rules]
         end
     end
   end

data/lib/technologist/repository.rb

@@ -10,6 +10,10 @@ module Technologist
       @framework_detector = FrameworkDetector.new(@git_repository)
     end
 
+    def frameworks
+      framework_detector.frameworks
+    end
+
     def primary_frameworks
       framework_detector.primary_frameworks
     end

data/lib/technologist/version.rb

@@ -1,3 +1,3 @@
 module Technologist
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: technologist
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Alexis Reigel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged