dev_dock 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010bb5ac9923609562ed9d55ca2d841832b568916e72779b05610a84842b61f6
-  data.tar.gz: 11d8dc854c1e714a9d54e062be1f5d128b04560dac34178fd36fc8d3d9be816f
+  metadata.gz: 02b863a98070f42c77a16db7816f22bc1cf8a82849c0d29a9feb1f4e29193583
+  data.tar.gz: b4814318af70abff9d9c26c3e8ff4851f209e9eec8cbd5ef1b9ad22834bf7f17
 SHA512:
-  metadata.gz: e39ca6d9855d58bec50f06c696bb9eb2a738e5d99585b1ddfc92fa78bbcacfd24b26385d6f63f3e85e5702713681ffac543881693c3bdf7f97b09f8faad2a5cb
-  data.tar.gz: 3467307e94de12974464484fa398f0a57f075bbe06c9cbfdddb804449f01db203c4ec9081b6786fc35ed2ace9bf27371039035946c408c73ab18177a7d37794e
+  metadata.gz: 219cafb0f2cf6fb87c8f7e5020e04f4c2ca67e678c7adcd6ea494197957a9d979eff3aee059e12afae5d27fb02d41e35926f28ec05bd986631e18bfa29c096fa
+  data.tar.gz: 240af4386462413ba3a062f9e654d1b18ed5609849d1dbf510553a9ca98b0222104018266a3dfeb4fefe6740be7f462a129037d47d70eb35cd2c740bb31c8cb7

data/.versions.conf

@@ -0,0 +1,2 @@
+ruby=2.4
+ruby-gemset=dev_dock

data/Gemfile

@@ -6,3 +6,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem "docker-api", "~> 1.34"
+
+gem "byebug", "~> 10.0", :groups => [:development, :test]

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    dev_dock (0.2.0)
+    dev_dock (0.2.1)
       docker-api (~> 1.34)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (10.0.2)
     diff-lcs (1.3)
     docker-api (1.34.2)
       excon (>= 0.47.0)
@@ -33,6 +34,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  byebug (~> 10.0)
   dev_dock!
   docker-api (~> 1.34)
   rake (~> 10.0)

data/help.txt

@@ -2,7 +2,7 @@ dev_dock <subcommand> [options...] <image>
 
 subcommands:
 
-  start <image>
+  start [options..] <image> [command..]
     Start a development session.
 
       options:

data/lib/dev_dock/container.rb

@@ -61,7 +61,7 @@ module DevDock
       end
     end
 
-    def run
+    def run_arguments
       arguments = [
         'docker',
         'run',
@@ -101,10 +101,13 @@ module DevDock
 
       arguments.push @image.name
 
-      arguments.push 'tmux'
-      arguments.push 'new'
+      arguments.push *@options.run_command
+
+      arguments
+    end
 
-      exec *arguments
+    def run
+      exec *run_arguments
     end
   end
 end

data/lib/dev_dock/options.rb

@@ -1,5 +1,10 @@
+require 'optparse'
+
 module DevDock
 
+  # Handles parsing options with the following syntax:
+  # dev_dock subcommand [options..] image [command..]
+
   class Options
 
     def initialize(argv)
@@ -7,76 +12,75 @@ module DevDock
       @environment = []
       @subcommand = nil
       @error = nil
+      @image_name = nil
       @argv = argv
+      @run_command = ['tmux', 'new']
     end
 
     def parse
-      parse_subcommand @argv[0]
+      parse_subcommand
+
       if not @error
         if @subcommand == "start"
-          parse_options @argv.slice(1, @argv.length)
-        end
-        if not @error
-          @image_name = @argv.last
+          parse_start
+        else
+          parse_end
         end
       end
+
     end
 
-    def parse_subcommand(arg)
-      if arg == 'start' or arg == 's'
-        @subcommand = 'start'
-      elsif arg == 'purge' or arg == 'p'
-        @subcommand = 'purge'
+    def parse_end
+      if @argv.length != 2
+        @error = 'Invalid number of arguments'
       else
-        @error = "Invalid subcommand #{arg}"
+        @image_name = @argv[1]
       end
     end
 
-    def parse_options(argv)
-      i = 0
-      while argv[i + 1]
-        arg = argv[i]
-        if arg == '--volume' or arg == '-v'
-          @volumes.push argv[i + 1]
-          i += 1
-        elsif arg == '--env' or arg == '-e'
-          if not argv[i + 2] or not argv[i + 1]
-            @error = "Invalid use of option #{arg}"
-            break
-          else
-            @environment.push argv[i + 1]
-            i += 1
-          end
+    def parse_start
+      parser = OptionParser.new 'Usage: dev_dock start [options..] image [command..]'
+
+      parser.on('-e', '--env ENVIRONMENT') do |env|
+        self.environment.push(env)
+      end
+      parser.on('-v', '--volume VOLUME') do |volume|
+        self.volumes.push(volume)
+      end
+      argv = @argv.slice(1, @argv.length - 1)
+      begin
+        parser.parse!(argv)
+      rescue OptionParser::ParseError => err
+        @error = err.reason
+      end
+
+      if not @error
+        if argv.length == 0
+          @error = 'Missing argument: image'
         else
-          @error = "Invalid option: #{arg}"
-          break
+          @image_name = argv.shift()
+          if argv.length > 0
+            @run_command = argv
+          end
         end
-        i += 1
       end
     end
 
-    def subcommand
-      @subcommand
-    end
-
-    def error
-      @error
-    end
-
-    def volumes
-      @volumes
-    end
-
-    def image_name
-      @image_name
+    def parse_subcommand
+      arg = @argv[0]
+      if arg == 'start' or arg == 's'
+        @subcommand = 'start'
+      elsif arg == 'purge' or arg == 'p'
+        @subcommand = 'purge'
+      else
+        @error = "Invalid subcommand #{arg}"
+      end
     end
 
-    def environment
-      @environment
-    end
+    attr_reader :run_command, :subcommand, :error, :volumes, :image_name, :environment
 
     def inspect
-      "Subcommand: #{@subcommand}, Image: #{@image_name}, Volumes: #{volumes}, Environment: "
+      "Subcommand: #{@subcommand}, Image: #{@image_name}, Volumes: #{@volumes}, Environment: #{@environment}, Run Command: #{@run_command}"
     end
 
   end

data/lib/dev_dock/version.rb

@@ -1,3 +1,3 @@
 module DevDock
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev_dock
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - AGhost-7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".travis.yml"
+- ".versions.conf"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt