bigrig 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d20693edd19fd3772463838bf41ac7a525541e83
-  data.tar.gz: 86f2dacffa8ff0ad6cba5170f6b7f5e73605dfdc
+  metadata.gz: 0a3826a554c69d11fbf7ad4e527cd9ec53e2ba42
+  data.tar.gz: 1ddc2fb0fe457a8c371c9f5f60c67342e8749566
 SHA512:
-  metadata.gz: 65cfa236bf4374f8b9522aa852246a701125378f6653ad1692e508facc3f8485314ba00d5ceea63125c2714f3a3177ae2f5be85b4bc08743a15990bd150d79e9
-  data.tar.gz: e7b721bd63a21e55d62bc6fe9c2df8cc1e7ffad0617cc891db53cfc0edd754e871a75bfeb840557656ce69577d1bdfb17e67cb02bf2e0098ff8cf2ee55455747
+  metadata.gz: e6ed6256a98e9895f8bdf61cecdc73aed139ec5c99054d693448794885ac5528209cd6e396685b91f92c8201fb3808587079f45cb9c1f688d3bff7ef34f8ba37
+  data.tar.gz: 40690cf035320de5b847a43fc24ccad61393f67c071d4b0c8be36eb1e48000b050b2d4528d321a5a7937f88023b05d07f217e3b9bb6eeee55efb2201098f3fac

data/CHANGELOG.md

@@ -43,3 +43,7 @@ Add `volumes` attriute
 0.2.2
 =====
 * scanned containers no longer restart their dependencies
+
+0.3.0
+=====
+* Honor .dockerignore, if present

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigrig (0.2.2)
+    bigrig (0.3.0)
       colorize (= 0.7.5)
       docker-api (= 1.20.0)
       filewatcher (= 0.4.0)
@@ -15,7 +15,6 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    coderay (1.1.0)
     colorize (0.7.5)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -23,12 +22,11 @@ GEM
     docker-api (1.20.0)
       excon (>= 0.38.0)
       json
-    excon (0.45.1)
+    excon (0.45.2)
     filewatcher (0.4.0)
       trollop (~> 2.0)
     gli (2.12.2)
     json (1.8.2)
-    method_source (0.8.2)
     open4 (1.3.4)
     parser (2.2.0.pre.8)
       ast (>= 1.1, < 3.0)
@@ -37,10 +35,6 @@ GEM
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
     powerpack (0.0.9)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
     rainbow (2.0.0)
     rake (10.4.2)
     rspec (3.1.0)
@@ -80,7 +74,6 @@ PLATFORMS
 DEPENDENCIES
   bigrig!
   popen4
-  pry
   rake
   rspec
   rspec-eventually

data/bigrig.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec')
   s.add_development_dependency('rspec-its')
   s.add_development_dependency('rubocop')
-  s.add_development_dependency('pry')
   s.add_development_dependency('vcr', '~> 2.9.3')
   s.add_development_dependency('webmock', '~> 1.20.4')
   s.add_development_dependency('popen4')

data/lib/bigrig/docker_adapter.rb

@@ -12,7 +12,7 @@ module Bigrig
   class DockerAdapter
     class << self
       def build(path, &block)
-        Docker::Image.build_from_tar(Docker::Util.create_dir_tar(path), {}, connection, &block).id
+        Docker::Image.build_from_tar(Tar.create_dir_tar(path), {}, connection, &block).id
       end
 
       def container_exists?(name)

data/lib/bigrig/go_matcher.rb

@@ -0,0 +1,27 @@
+# This thing's pretty stupid, but it should be good enough for the majority
+# of cases
+#
+# Right not it breaks with ^, $, [, ], and \\
+module Bigrig
+  class GoMatcher
+    ESCAPES = ['.', '(', ')']
+    REPLACES = {
+      /^\/?/ => '',
+      /^/ => '^',
+      /$/ => '/',
+      '?' => '[^/]',
+      '+' => '\\\\+',
+      '*' => '[^/]+'
+    }
+
+    def initialize(glob)
+      ESCAPES.each { |e| glob.gsub! e, "\\#{e}" }
+      REPLACES.each { |k, v| glob.gsub! k, v }
+      @regex = %r{#{glob}} # rubocop:disable Style/RegexpLiteral
+    end
+
+    def matches?(path)
+      @regex.match("#{path}/") != nil
+    end
+  end
+end

data/lib/bigrig/tar.rb

@@ -0,0 +1,48 @@
+module Bigrig
+  class Tar
+    class << self
+      def create_dir_tar(directory)
+        tempfile = create_temp_file
+        directory += '/' unless directory.end_with?('/')
+
+        create_relative_dir_tar(directory, tempfile)
+
+        File.new(tempfile.path, 'r')
+      end
+
+      def create_relative_dir_tar(directory, output)
+        ignore_matchers = read_docker_ignore(directory).map { |x| GoMatcher.new x }
+
+        Gem::Package::TarWriter.new(output) do |tar|
+          Find.find(directory) do |prefixed_file_name|
+            unprefixed_file_name = prefixed_file_name[directory.length..-1]
+            ignore_matchers.detect { |x| x.matches? unprefixed_file_name } && next
+            add_file tar, prefixed_file_name, unprefixed_file_name
+          end
+        end
+      end
+
+      def add_file(tar, prefixed_file_name, unprefixed_file_name)
+        stat = File.stat(prefixed_file_name)
+
+        stat.file? || return
+        tar.add_file_simple(
+          unprefixed_file_name, stat.mode, stat.size
+        ) do |tar_file|
+          IO.copy_stream(File.open(prefixed_file_name, 'rb'), tar_file)
+        end
+      end
+
+      def create_temp_file
+        tempfile_name = Dir::Tmpname.create('out') {}
+        File.open(tempfile_name, 'wb+')
+      end
+
+      def read_docker_ignore(directory)
+        File.read(File.join directory, '.dockerignore').split "\n"
+      rescue Errno::ENOENT
+        []
+      end
+    end
+  end
+end

data/lib/bigrig/version.rb

@@ -1,3 +1,3 @@
 module Bigrig
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/bigrig.rb

@@ -2,9 +2,11 @@ require 'bigrig/actions'
 require 'bigrig/descriptor'
 require 'bigrig/dependency_graph'
 require 'bigrig/docker_adapter'
+require 'bigrig/go_matcher'
 require 'bigrig/log_tailer'
 require 'bigrig/models'
 require 'bigrig/output_parser'
+require 'bigrig/tar'
 require 'bigrig/runner'
 require 'bigrig/version'
 

data/spec/bigrig/docker_adapter_spec.rb

@@ -1,4 +1,3 @@
-require 'pry'
 module Bigrig
   describe DockerAdapter do
 

data/spec/bigrig/go_matcher_spec.rb

@@ -0,0 +1,76 @@
+module Bigrig
+  describe GoMatcher do
+    it 'treats leading slash as optional' do
+      expect(GoMatcher.new('/test').matches? 'test').to be true
+      expect(GoMatcher.new('test').matches? 'test').to be true
+    end
+
+    it 'ignores unmatched trailing portion of the path' do
+      expect(GoMatcher.new('test').matches? 'test/123').to be true
+      expect(GoMatcher.new('test').matches? 'test123/123').to be false
+    end
+
+    it 'matches subdirectories' do
+      expect(GoMatcher.new('test/123').matches? 'test/123').to be true
+    end
+
+    it 'escapes regex characters' do
+      expect(GoMatcher.new('...').matches? '...').to be true
+      expect(GoMatcher.new('...').matches? 'abc').to be false
+      expect(GoMatcher.new('(').matches? '(').to be true
+      expect(GoMatcher.new(')').matches? ')').to be true
+      expect(GoMatcher.new('+').matches? '+').to be true
+      expect(GoMatcher.new('{').matches? '{').to be true
+      expect(GoMatcher.new('}').matches? '}').to be true
+    end
+
+    describe '*' do
+      it 'matches any sequence of non-Separator characters' do
+        expect(GoMatcher.new('test/*/123').matches? 'test/321/123').to be true
+        expect(GoMatcher.new('*/*/123').matches? 'test/321/123').to be true
+        expect(GoMatcher.new('*/*/*').matches? 'test/321/123').to be true
+
+        expect(GoMatcher.new('*/123').matches? 'test/321/123').to be false
+      end
+    end
+
+    describe '?' do
+      it 'matches any single non-Separator character' do
+        expect(GoMatcher.new('/?est').matches? 'test').to be true
+      end
+    end
+
+    describe '[]' do
+      it 'matches a range of characters' do
+        expect(GoMatcher.new('[t]est').matches? 'test').to be true
+        expect(GoMatcher.new('[123t]est').matches? 'test').to be true
+        expect(GoMatcher.new('[a-z]est').matches? 'test').to be true
+        expect(GoMatcher.new('[b]est').matches? 'test').to be false
+      end
+    end
+
+    describe '[^]' do
+      it 'negates a range of characters' do
+        expect(GoMatcher.new('[^t]est').matches? 'test').to be false
+      end
+    end
+
+    describe 'c' do
+      it %{matches character c (c != '\\', '-', ']')} do
+        expect(GoMatcher.new('t').matches? 't').to be true
+        expect(GoMatcher.new('t').matches? 'test').to be false
+      end
+    end
+
+    describe '\\\\c' do
+      it 'matches character c' do
+        expect(GoMatcher.new('\\[').matches? '[').to be true
+        expect(GoMatcher.new('\\-').matches? '-').to be true
+      end
+
+      it 'matches \\' do
+        expect(GoMatcher.new('\\\\').matches? '\\').to be true
+      end
+    end
+  end
+end

data/spec/bigrig/tar_spec.rb

@@ -0,0 +1,10 @@
+module Bigrig
+  describe Tar do
+    it 'honors the .dockerignore' do
+      expect(Tar).to_not receive(:add_file).with anything, anything, 'ignoreme/ignore'
+      expect(Tar).to_not receive(:add_file).with anything, anything, 'ignoreme2/ignore'
+      expect(Tar).to receive(:add_file).with anything, anything, 'Dockerfile'
+      Bigrig::Tar.create_dir_tar 'spec/data/build'
+    end
+  end
+end

data/spec/data/build/.dockerignore

@@ -0,0 +1,2 @@
+ignoreme
+ignoreme2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigrig
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Your Name Here
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +207,7 @@ files:
 - lib/bigrig/dependency_graph.rb
 - lib/bigrig/descriptor.rb
 - lib/bigrig/docker_adapter.rb
+- lib/bigrig/go_matcher.rb
 - lib/bigrig/log_tailer.rb
 - lib/bigrig/models.rb
 - lib/bigrig/models/application.rb
@@ -228,6 +215,7 @@ files:
 - lib/bigrig/models/container.rb
 - lib/bigrig/output_parser.rb
 - lib/bigrig/runner.rb
+- lib/bigrig/tar.rb
 - lib/bigrig/version.rb
 - spec/bigrig/actions/destroy_action_spec.rb
 - spec/bigrig/actions/dev_action_spec.rb
@@ -237,15 +225,19 @@ files:
 - spec/bigrig/dependency_graph_spec.rb
 - spec/bigrig/descriptor_spec.rb
 - spec/bigrig/docker_adapter_spec.rb
+- spec/bigrig/go_matcher_spec.rb
 - spec/bigrig/log_tailer_spec.rb
 - spec/bigrig/models/application_spec.rb
 - spec/bigrig/models/container_spec.rb
 - spec/bigrig/output_parser_spec.rb
+- spec/bigrig/tar_spec.rb
 - spec/bigrig_spec.rb
 - spec/data/adds_volume.json
 - spec/data/adds_volumes_from.json
 - spec/data/addscontainer.json
+- spec/data/build/.dockerignore
 - spec/data/build/Dockerfile
+- spec/data/build/ignoreme/ignore
 - spec/data/build/test
 - spec/data/dev.json
 - spec/data/duplicate.json