guard-fig 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0a4fe257731ce9ad294f6c49f64c52ce6be27a3
-  data.tar.gz: 50a05466bec28bdfe6292805aa58c869d4483307
+  metadata.gz: 8e0d8d4cd57bd9d17d16d9a5515e915a6980b259
+  data.tar.gz: 3896bc65175f47a9f021339b46045d608e7543d2
 SHA512:
-  metadata.gz: 7ba02a53aa3793766099f2390eb848ca31469e64fabfd5842b6c96f4a9a68ad0221d99a5f824960d4164f5df0bc184ee114fec6cbcf5467bca59dc205e008cf9
-  data.tar.gz: 62137cafec167091f124504d6d21f96a0d35ad387ed741802ca1323af9217308075437742c2fade508bcb0b25debb8eef33c04c6d153ce26160c207dbbc52fd3
+  metadata.gz: 95cc9bd82c7c0c092f62da009b6a929c0a2d2bc471752a5c20c5962156ab839ff434a1be965c20439ffcb3179f39eddd34e0ce0eb5b263fc8a01bde2c49f4bb3
+  data.tar.gz: fb7cf89a555213779480d4d2aedef2d6c6ae0b2b641120b70e4b23872d821aaa78665ebdea8cb46db215ecf0fb1a04cf5f21ccf4245533bdc94607a2873c93ab

data/README.md

@@ -1,6 +1,6 @@
 # Guard::Fig
 
-Guard::Fig helps you develop docker containers faster using [fig](http://fig.sh/)
+Guard::Fig helps you develop docker containers faster using [fig](http://fig.sh/) and [docker-compose](https://github.com/docker/compose)
 
 ## Installation
 
@@ -23,7 +23,7 @@ Or install it yourself as:
 Add the following to your Guardfile
 
 ```
-guard :fig, boot2docker_start: true, build_on_start: true do
+guard :fig, boot2docker_start: true, build_on_start: true, command: 'fig' do
   ignore %r{\.#}
   watch %r{.*}
 end

data/lib/guard/fig.rb

@@ -5,10 +5,12 @@ require "guard/fig/version"
 
 module ::Guard
   class Fig < Plugin
+    CONFIG_NAMES = ['fig.yml', 'fig.yaml', 'docker-compose.yml', 'docker-compose.yaml']
+
     def initialize(options = {})
       super(options)
-      @config = YAML.load_file('fig.yml')
-      @fig = FigProxy.new
+      @config = load_config
+      @fig = FigProxy.new(options)
     end
 
     def start
@@ -28,7 +30,7 @@ module ::Guard
     def run_on_changes(paths)
       debug paths.inspect
 
-      if paths.any? { |x| x =~ /fig\.yml/ }
+      if paths.any? { |x| x =~ Regexp.new(Regexp.escape(CONFIG_NAMES.join("|"))) }
         @fig.up
       else
         restart_services(paths)
@@ -78,6 +80,20 @@ module ::Guard
     def debug(msg)
       puts msg if ENV['DEBUG']
     end
+
+    def load_config
+      config_file = CONFIG_NAMES.find do |file|
+        File.exist?(file)
+      end
+
+      if config_file
+        YAML.load_file(config_file)
+      else
+        puts "No file found with any name: #{CONFIG_NAMES.join(', ')}"
+        exit 1
+      end
+
+    end
   end
 end
 

data/lib/guard/fig/ChangeLog

@@ -0,0 +1,4 @@
+2015-04-27  Jorge Dias  <jorge@mrdias.com>
+
+	* Version 0.1.1
+	* Configurable command

data/lib/guard/fig/fig_proxy.rb

@@ -3,12 +3,18 @@ require 'guard/plugin'
 module Guard
   class Fig < Plugin
     class FigProxy
+      attr_reader :command
+
+      def initialize(options)
+        @command = options.fetch(:command, 'fig')
+      end
+
       def build(service = nil)
-        system "fig build #{service}"
+        system "#{command} build #{service}"
       end
 
       def up recreate: true
-        cmd = "fig up -d"
+        cmd = "#{command} up -d"
         unless recreate
           cmd << " --no-recreate"
         end
@@ -16,11 +22,11 @@ module Guard
       end
 
       def stop(service = nil)
-        system "fig stop #{service}"
+        system "#{command} stop #{service}"
       end
 
       def remove(service)
-        system "fig rm --force #{service}"
+        system "#{command} rm --force #{service}"
       end
     end
   end

data/lib/guard/fig/version.rb

@@ -2,6 +2,6 @@ require 'guard/plugin'
 
 module Guard
   class Fig < Plugin
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-fig
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jorge Dias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ files:
 - Rakefile
 - guard-fig.gemspec
 - lib/guard/fig.rb
+- lib/guard/fig/ChangeLog
 - lib/guard/fig/fig_proxy.rb
 - lib/guard/fig/version.rb
 homepage: https://rubygems.org/gems/guard-fig