quaker 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5506c92adcb440fad16a366dc3b67a70b62e730
-  data.tar.gz: 8d60501e924b944e8ab2a39de9d99b2b3c32f0e6
+  metadata.gz: 44ce3293ce8c169eedc97c4a6433fcdf865542e3
+  data.tar.gz: 085a92c69d42eaa6455c61e9edbcced63597343e
 SHA512:
-  metadata.gz: 3317bdd074ce3cabcb055f981f8367e9f154654919f30b5c2d64353cdce05e90c89b2935307689e2b414cc2bb57dfce18478577e8d7c504991c3e0b7905021ea
-  data.tar.gz: 6e3d17d92363c43103278930c07f32a6b40e439f350004455e6a839aa8f0a5b9847977f7729bc1c32ee7e103780b090042366c885f70ede6a52e7c29f6a8d6ec
+  metadata.gz: 5ff78b67637e14828190df6f2e627a50813a7d0d884290aeb5e7a706701503939549f9afb94fda62e4a5a796d974e3e8282550b54a7d7301fc45e8f435a221c4
+  data.tar.gz: dd0f33de4a2c3830ab34385c69111d9bbcef8f9d4c80e1d98873f6500fed1a86b5bc80e1e33b1e4d6100ce6ed8fb7711c068280181f885e4ad17453a056178d5

data/.gitignore

@@ -8,4 +8,5 @@
 /spec/reports/
 /tmp/
 *.gem
+.DS_Store
 

data/.gitmodules

@@ -1,3 +1,6 @@
 [submodule "examples/svc1"]
 	path = examples/svc1
 	url = https://github.com/igorshapiro/quaker-svc1.git
+[submodule "spec/fixtures/svc1"]
+	path = spec/fixtures/svc1
+	url = https://github.com/igorshapiro/quaker-svc1

data/Gemfile

@@ -4,3 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'clamp'
+gem 'git_clone_url'
+
+group :test do
+  gem "codeclimate-test-reporter", group: :test, require: nil
+end

data/README.md

@@ -1,4 +1,7 @@
 [![Code Climate](https://codeclimate.com/github/igorshapiro/quaker/badges/gpa.svg)](https://codeclimate.com/github/igorshapiro/quaker)
+[![Gem Version](https://badge.fury.io/rb/quaker.svg)](https://badge.fury.io/rb/quaker)
+[![CircleCI](https://circleci.com/gh/igorshapiro/quaker.svg?style=svg)](https://circleci.com/gh/igorshapiro/quaker)
+[![Test Coverage](https://codeclimate.com/github/igorshapiro/quaker/badges/coverage.svg)](https://codeclimate.com/github/igorshapiro/quaker/coverage)
 
 # Quaker
 

data/exe/quaker

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'quaker'
+
+Quaker::run

data/lib/quaker/compose_file.rb

@@ -1,10 +1,12 @@
-require 'yaml'
+module Quaker
+  require 'yaml'
 
-class ComposeFile
-  def build spec
-    {
-      'version' => '2',
-      'services' => spec
-    }.to_yaml
+  class ComposeFile
+    def build spec
+      {
+        'version' => '2',
+        'services' => spec
+      }.to_yaml
+    end
   end
 end

data/lib/quaker/git_resolver.rb

@@ -1,31 +1,48 @@
-require 'open3'
+module Quaker
+  require 'open3'
+  require 'git_clone_url'
 
-class GitResolver
-  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")
-        out = stdout.gets
-        out && out.include?(repo)
-      }
-      .first
-    return nil unless dir
-    "./#{dir}"
-  end
+  class GitResolver
+    # Parses repository url to { username: ..., repository: ...}
+    def parse_url url
+      begin
+        uri = GitCloneUrl.parse(url)
+
+        if uri.path.match /^\/?(.*?)\/(.*?)(.git)?$/
+          return { username: $1, repo: $2 }
+        end
+      rescue URI::InvalidComponentError => ex
+      end
+      url
+    end
+
+    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}'")
+          stdout.each_line
+            .map(&:strip)
+            .map {|l| parse_url(l) }
+            .include?(parse_url(repo))
+        }
+        .first
+      return nil unless dir
+      "./#{dir}"
+    end
 
-  def resolve services_map
-    for name, spec in services_map
-      puts spec
-      git_repo = spec.delete("git")
-      next unless git_repo
+    def resolve services_map
+      for name, spec in services_map
+        git_repo = spec.delete("git")
+        next unless git_repo
 
-      dir = find_dir_for_repo git_repo
+        dir = find_dir_for_repo git_repo
 
-      puts "ERROR: Unable to find dir for repo #{git_repo}" and return unless dir
+        $stderr.puts "ERROR: Unable to find dir for repo #{git_repo}" and return unless dir
 
-      spec["build"] = dir
+        spec["build"] = dir
+      end
+      services_map
     end
-    services_map
   end
 end

data/lib/quaker/include.rb

@@ -1,15 +1,17 @@
-require 'yaml'
+module Quaker
+  require 'yaml'
 
-class Include
-  INCLUDE_KEY = 'include'
-  def process filepath
-    dir = File.join(filepath, '..')
-    spec = YAML.load(File.read(filepath))
-    return spec unless spec.has_key?(INCLUDE_KEY)
+  class Include
+    INCLUDE_KEY = 'include'
+    def process filepath
+      dir = File.join(filepath, '..')
+      spec = YAML.load(File.read(filepath))
+      return spec unless spec.has_key?(INCLUDE_KEY)
 
-    spec
-      .delete(INCLUDE_KEY)
-      .map {|file| File.expand_path(file, dir) }
-      .inject(spec) { |acc, file| acc.merge(process file) }
+      spec
+        .delete(INCLUDE_KEY)
+        .map {|file| File.expand_path(file, dir) }
+        .inject(spec) { |acc, file| acc.merge(process file) }
+    end
   end
 end

data/lib/quaker/path_extensions.rb

@@ -0,0 +1,23 @@
+module Quaker
+  class PathExtensions
+    def expand_path volumes_desc, build_path
+      parts = volumes_desc.split(':')
+      parts[0].gsub! /^\~/, build_path
+      parts.join(':')
+    end
+
+    def expand_service_volumes spec
+      build_path = spec['build']
+      return unless build_path
+
+      volumes = spec['volumes']
+      return unless volumes
+
+      spec['volumes'] = volumes.map{|v| expand_path(v, build_path) }
+    end
+
+    def expand services
+      services.each {|name, spec| expand_service_volumes(spec) }
+    end
+  end
+end

data/lib/quaker/tag_filter.rb

@@ -1,32 +1,34 @@
-class TagFilter
-  def dependencies services_map, name
-    spec = services_map[name]
-    depends_on = spec["depends_on"] || []
-    links = (spec["links"] || []).map{|l| l.split(':')[0]}
-    deps = links + depends_on
-    deps + deps.map{|d| dependencies(services_map, d)}.flatten
-  end
+module Quaker
+  class TagFilter
+    def dependencies services_map, name
+      spec = services_map[name]
+      depends_on = spec["depends_on"] || []
+      links = (spec["links"] || []).map{|l| l.split(':')[0]}
+      deps = links + depends_on
+      deps + deps.map{|d| dependencies(services_map, d)}.flatten
+    end
 
-  def is_tagged_service spec, tags_list
-    svc_tags = spec.delete("tags") || []
+    def is_tagged_service spec, tags_list
+      svc_tags = spec.delete("tags") || []
 
-    # Skip service if no common tags
-    common = svc_tags & tags_list
-    common && !common.empty?
-  end
+      # Skip service if no common tags
+      common = svc_tags & tags_list
+      common && !common.empty?
+    end
 
-  def filter services_map, tags_list
-    return services_map if !tags_list || tags_list.empty?
+    def filter services_map, tags_list
+      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
+      services_map.inject({}){|acc, (name, spec)|
+        if is_tagged_service(spec, tags_list)
+          acc[name] = spec
 
-        dependencies(services_map, name)
-          .inject(acc){|acc, d| acc.update(d => services_map[d])}
-      end
+          dependencies(services_map, name)
+            .inject(acc){|acc, d| acc.update(d => services_map[d])}
+        end
 
-      acc
-    }
+        acc
+      }
+    end
   end
 end

data/lib/quaker/tag_matcher.rb

@@ -0,0 +1,23 @@
+module Quaker
+  module TagMatcher
+    def self.match tags, patterns
+      return true if patterns.nil? || patterns.empty?
+      return false if tags.nil? || tags.empty?
+
+      patterns.any? {|pattern|
+        tags.any? {|tag| pattern_matches_string?(tag, pattern)}
+      }
+    end
+
+    def self.pattern_matches_string? s, pattern
+      s == pattern || wildcard_matches?(s, pattern)
+    end
+
+    def self.wildcard_matches? s, pattern
+      return false unless pattern.include?('*')
+      escaped = Regexp.escape(pattern).gsub('\*','.*?')
+      regex = Regexp.new "^#{escaped}$", Regexp::IGNORECASE
+      !!(s =~ regex)
+    end
+  end
+end

data/lib/quaker/templates.rb

@@ -0,0 +1,28 @@
+require 'quaker/tag_matcher'
+
+module Quaker
+  class Templates
+    def apply services
+      templates = services.select {|name, v| template?(name)}
+      services
+        .reject {|name, v| template?(name)}
+        .inject({}) {|acc, (name, spec)|
+          acc.update(name => extend_with_matchine_templates(spec, templates))
+        }
+    end
+
+    def extend_with_matchine_templates service, templates
+      templates
+        .select {|name, spec| Quaker::TagMatcher::match(service["tags"], spec["tags"])}
+        .inject(service) {|svc, (_, spec)|
+          filtered_template_content = spec
+            .select{|name, spec| name != 'tags' }
+          svc.merge(filtered_template_content)
+        }
+    end
+
+    def template?(k)
+      !!(k =~ /_template$/)
+    end
+  end
+end

data/lib/quaker/version.rb

@@ -1,3 +1,3 @@
 module Quaker
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/quaker.rb

@@ -2,39 +2,45 @@ require "quaker/version"
 require "quaker/include"
 require "quaker/tag_filter"
 require "quaker/git_resolver"
+require "quaker/templates"
+require "quaker/path_extensions"
 require "quaker/compose_file"
 
 module Quaker
   require 'clamp'
 
-  Clamp do
-    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"
-
-    def default_spec_file
-      File.expand_path('docker/services/all.yml', dir)
-    end
-
-    def default_dir
-      Dir.pwd
-    end
-
-    def dump_params
-      puts "Spec: #{spec_file}"
-      puts "Dir: #{dir}"
-    end
-
-    def execute
-      dump_params
-
-      Dir.chdir dir
-
-      spec = Include.new.process spec_file
-      spec = TagFilter.new.filter spec, tags_list
-      spec = GitResolver.new.resolve spec
-      spec = ComposeFile.new.build spec
-      puts spec
+  def self.run
+    Clamp do
+      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"
+
+      def default_spec_file
+        File.expand_path('docker/services/all.yml', dir)
+      end
+
+      def default_dir
+        Dir.pwd
+      end
+
+      def dump_params
+        puts "Spec: #{spec_file}"
+        puts "Dir: #{dir}"
+      end
+
+      def execute
+        # dump_params
+
+        Dir.chdir dir
+
+        spec = Include.new.process spec_file
+        spec = Templates.new.apply spec
+        spec = TagFilter.new.filter spec, tags_list
+        spec = GitResolver.new.resolve spec
+        spec = PathExtensions.new.expand spec
+        spec = ComposeFile.new.build spec
+        puts spec
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quaker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Igor Shapiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,10 @@ files:
 - lib/quaker/compose_file.rb
 - lib/quaker/git_resolver.rb
 - lib/quaker/include.rb
+- lib/quaker/path_extensions.rb
 - lib/quaker/tag_filter.rb
+- lib/quaker/tag_matcher.rb
+- lib/quaker/templates.rb
 - lib/quaker/version.rb
 - quaker.gemspec
 homepage: https://igorshapiro.github.io/quaker/