quaker 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 758feb9a3fef5b99db3c41f1ca8ae35cff00fc65
-  data.tar.gz: a5338bfc13ea7b7b9086a92e4522589f5577716c
+  metadata.gz: 6662352e2d001dfb163f38aac52433782a13a06a
+  data.tar.gz: 41e455a16923463036a9e70ff844b58d821604eb
 SHA512:
-  metadata.gz: 26eef5aeeee9d0cefa705bfeca306fe380bec996f8473d4ebca04edb2e1f6e46b5757e1d2bd56b94ab273bbb8402ffd65f3b3d77cabdae2950d13edcad96320c
-  data.tar.gz: 29c402e3478bfb33f0f92b34bde650c65ebd95cd4fe8faf3ddafe56be6012f6ddf4b2f1ed747617d7f843e21006bb448ab250f58880f10b3f258019188ebe447
+  metadata.gz: dff0af7d661da1176cdb569aae6a318fc3b007ce1117269d208b655d38a085c51df93dc5a9d3f0256b8f164e1363d84e84fadea1dcaad2ea95a20ac472749313
+  data.tar.gz: 88528c52fcae762217c3fd7203ed60b8c851a49e6418df0310d4a430703f85cd75a66c96949af0df43a8b85e437cf0be1f642800a48116a964a7979ca1688962

data/lib/quaker/git_resolver.rb

@@ -8,10 +8,11 @@ module Quaker
       begin
         uri = GitCloneUrl.parse(url)
 
-        if uri.path.match /^\/?(.*?)\/(.*?)(.git)?$/
+        if uri.path.match(/^\/?(.*?)\/(.*?)(.git)?$/)
           return { username: $1, repo: $2 }
         end
-      rescue URI::InvalidComponentError => ex
+      rescue URI::InvalidComponentError
+        $stderr.puts "ERROR: Invalid git url: #{url}"
       end
       url
     end
@@ -19,8 +20,8 @@ module Quaker
     def find_dir_for_repo repo
       dir = Dir.glob('*')
         .select {|f| File.directory? f}
-        .select {|dir|
-          stdin, stdout, stderr = Open3.popen3("cd #{dir} && git remote -v | awk '{print $2}'")
+        .select {|subdir|
+          _stdin, stdout, _stderr = Open3.popen3("cd #{subdir} && git remote -v | awk '{print $2}'")
           stdout.each_line
             .map(&:strip)
             .map {|l| parse_url(l) }
@@ -32,7 +33,7 @@ module Quaker
     end
 
     def resolve services_map
-      for name, spec in services_map
+      for _, spec in services_map
         git_repo = spec.delete("git")
         next unless git_repo
 

data/lib/quaker/path_extensions.rb

@@ -2,7 +2,7 @@ module Quaker
   class PathExtensions
     def expand_path volumes_desc, build_path
       parts = volumes_desc.split(':')
-      parts[0].gsub! /^\~/, build_path
+      parts[0].gsub!(/^\~/, build_path)
       parts.join(':')
     end
 
@@ -17,7 +17,7 @@ module Quaker
     end
 
     def expand services
-      services.each {|name, spec| expand_service_volumes(spec) }
+      services.each {|_name, spec| expand_service_volumes(spec) }
     end
   end
 end

data/lib/quaker/tag_filter.rb

@@ -27,19 +27,19 @@ module Quaker
       TagMatcher.match svc_tags, tags_list
     end
 
-    def filter services_map, tags_list
+    def filter services_map, tags_list, options = {}
       return services_map if !tags_list || tags_list.empty?
 
-      services_map.inject({}){|acc, (name, spec)|
-        if is_tagged_service(spec, tags_list)
-          acc[name] = spec
+      include_tagged_services = !options[:only_deps]
 
-          dependencies(services_map, name)
-            .inject(acc){|acc, d| acc.update(d => services_map[d])}
-        end
-
-        acc
-      }
+      services_map
+        .select {|_, spec| is_tagged_service(spec, tags_list) }
+        .map {|name, _|
+          service = include_tagged_services ? [name] : []
+          service + dependencies(services_map, name)
+        }
+        .flatten
+        .inject({}) {|acc, (name, spec)| acc.update(name => services_map[name])}
     end
   end
 end

data/lib/quaker/templates.rb

@@ -4,9 +4,9 @@ require 'deep_merge'
 module Quaker
   class Templates
     def apply services
-      templates = services.select {|name, v| template?(name)}
+      templates = services.select {|name, _| template?(name)}
       services
-        .reject {|name, v| template?(name)}
+        .reject {|name, _| template?(name)}
         .inject({}) {|acc, (name, spec)|
           acc.update(name => extend_with_matching_templates(spec, templates))
         }
@@ -14,10 +14,10 @@ module Quaker
 
     def extend_with_matching_templates service, templates
       templates
-        .select {|name, spec| Quaker::TagMatcher::match(service["tags"], spec["tags"])}
+        .select {|_, spec| Quaker::TagMatcher::match(service["tags"], spec["tags"])}
         .inject(service) {|svc, (_, spec)|
           filtered_template_content = spec
-            .select{|name, spec| name != 'tags' }
+            .select{|name, _| name != 'tags' }
           svc.deep_merge(filtered_template_content)
         }
     end

data/lib/quaker/version.rb

@@ -1,3 +1,3 @@
 module Quaker
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/quaker.rb

@@ -14,6 +14,7 @@ module Quaker
       parameter "[SPEC_FILE]", "Extended docker-compose file"
       option %w(--tags -t), "TAGS", "Filter services (and dependencies) by tag", multivalued: true
       option %w(--dir -d), "DIR", "Specify base directory"
+      option %w(--only-deps -T), :flag, "Include only dependencies"
 
       def default_spec_file
         File.expand_path('docker/services/all.yml', dir)
@@ -35,7 +36,7 @@ module Quaker
 
         spec = Include.new.process spec_file
         spec = Templates.new.apply spec
-        spec = TagFilter.new.filter spec, tags_list
+        spec = TagFilter.new.filter spec, tags_list, only_deps: only_deps?
         spec = GitResolver.new.resolve spec
         spec = PathExtensions.new.expand spec
         spec = ComposeFile.new.build spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quaker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Igor Shapiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler