fig_rake 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97b4bb73ecaa56b396a843a1dd1f4d07f7324d73
-  data.tar.gz: 6e536728b3798dd17369ccb5f6cd87701aff4cf1
+  metadata.gz: a6ef47c17d9a59c98f96866d8f8fc91369281e89
+  data.tar.gz: 9aac41cfabd1428ae42deebddea9314b0b9c165b
 SHA512:
-  metadata.gz: 984a383459fb81ffc26615379ebf69c4772a6b70c66fbfb3d27daebb680d43d9bf5b740953a511723a0110feb99847cf28b90fb7eb61ae03870efcc14647f698
-  data.tar.gz: bccc0f6a2256c2ba79eef1723a42c05036837c3e33b0da17060df98ee03c88115c36b99a4458c5c13a140d5d30b40145a732793160ad314b87fedf9029846fec
+  metadata.gz: bc6f2ff4c81db2169b0f836f1b4ddc6a33dff7b9a1bfb3f3c2580ae0f366621afa52dae633725d1887eb1baa6ca09e3e5acf0840bda991f755b27e58c7ee1253
+  data.tar.gz: 106ae7164565dbab78919dafd856c81c56f6f3eb6f92b4fd3e03a57c4ec533498081d119443300091e96133a5afdc57bd2607e1ac16c049378ca724611aa9887

data/lib/fig_rake/cli.rb

@@ -7,7 +7,7 @@ module FigRake
     def initialize(command, arguments)
       @options = Configuration.new
       parse_arguments(command, arguments)
-      @command = Command.new(command, @options.container_name, @options.rake_args)
+      @command = Command.new(command, @options.container_name, @options.rake_args, @options.docker_command)
     end
 
     def exec

data/lib/fig_rake/command.rb

@@ -1,14 +1,14 @@
 module FigRake
   class Command
-    attr_accessor :container_name, :rake_args, :command
+    attr_accessor :container_name, :rake_args, :command, :docker_command
     
-    def initialize(command, container_name, rake_args)
-      @command, @container_name, @rake_args = command, container_name, rake_args
+    def initialize(command, container_name, rake_args, docker_command)
+      @command, @container_name, @rake_args, @docker_command = command, container_name, rake_args, docker_command
     end
 
     def exec
-      p "fig run --rm --entrypoint=#{command} #{container_name} #{rake_args.join(' ')}"
-      exit system("fig run --rm --entrypoint=#{command} #{container_name} #{rake_args.join(' ')}")
+      p "#{docker_command} run --rm --entrypoint=#{command} #{container_name} #{rake_args.join(' ')}"
+      exit system("#{docker_command} run --rm --entrypoint=#{command} #{container_name} #{rake_args.join(' ')}")
     end
   end
 end

data/lib/fig_rake/configuration.rb

@@ -2,35 +2,65 @@ require 'yaml'
 
 module FigRake
   class Configuration
-    attr_accessor :container_name, :rake_args
+    attr_accessor :container_name, :rake_args, :docker_command
+
+    COMPOSE_FILE = "docker-compose.yml"
+    FIG_FILE = "fig.yml"
     
-    def initialize(name=nil)
-      @container_name = name ||= name_from_defaults
+    def initialize(name: nil, command: nil)
+      @container_name = name || name_from_defaults
+      @docker_command = command || command_from_defaults
     end
 
     def name_from_defaults
-      name_from_environment ||
-        name_from_frake_configuration ||
-        name_from_fig
+      name_from_environment || name_from_file
+    end
+
+    def command_from_defaults
+      command_from_environment || command_from_file
     end
 
     def name_from_environment
-      ENV['FRAKE_DEFAULT']
+      ENV['FIG_RAKE_CONTAINER']
+    end
+
+    def command_from_environment
+      ENV['FIG_RAKE_COMMAND']
     end
 
-    def name_from_frake_configuration
-      File.read('.frake')
-    rescue Errno::ENOENT
-      nil
+    def compose_file_exists?
+      File.exists? COMPOSE_FILE
+    end
+
+    def fig_file_exists?
+      File.exists? FIG_FILE
+    end
+
+    def command_from_file
+      case
+      when compose_file_exists?
+        "docker-compose"
+      when fig_file_exists?
+        "fig"
+      else
+        raise "No configuration file found are you in the right Directory?"
+      end
     end
 
-    def name_from_fig
-      container_config = YAML.load(File.read('fig.yml')).to_a.select do |(_, opts)|
+    def name_from_file
+      file_name = case
+                  when compose_file_exists?
+                    COMPOSE_FILE
+                  when fig_file_exists?
+                    FIG_FILE
+                  else
+                    raise "No configuration file found are you in the right Directory?"
+                  end
+      
+      container_config = YAML.load(File.read(file_name)).to_a.select do |(_, opts)|
         opts.has_key?("build")
       end
       container_config.first.first
-    rescue Errno::ENOENT
-      nil
     end
-  end
+  end 
 end

data/lib/fig_rake/mixin.rb

@@ -4,8 +4,8 @@ require 'fig_rake/command'
 module FigRake
   module Mixin
     def run_in_fig(args)
-      configuration = Configuration.new(default_name)
-      Command.new(command, configuration.container_name, args).exec
+      configuration = Configuration.new(name: default_name)
+      Command.new(command, configuration.container_name, args, configuration.docker_command).exec
     end
   end
 end

data/lib/fig_rake/version.rb

@@ -1,3 +1,3 @@
 module FigRake
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig_rake
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Edward Paget
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler