entangler 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e910a8be4617a7df89c5a0d5f94b51617a26deb6
-  data.tar.gz: 1d083cf56c15e7f332c703eb36381d31e717b7f6
+  metadata.gz: 4338665fa9a10ccedafc5eca1b0ad709fd351f01
+  data.tar.gz: 06eeb20f8ed99e4c74a4a3a930a95e3a306f84ca
 SHA512:
-  metadata.gz: 829fd8b9cc788a049e1daab942a3eff9d911351f580b71f276610c0c48b758638698868066ceb39e3bac63a6bebc7e295915d19fd95d7f93e4a66a0bfe057b65
-  data.tar.gz: b08f880f5e249658f83b906e3789adf84b999d9922b068dc6eec037aa069475a62434212287f3a3898f56661a1a01c43911eab4c9b70fd6c59a12f153edd92ef
+  metadata.gz: 142266121a2a95f0f4936f008d3906bdcc10ca8eb56c32d8106d2deafbe43234d72d61054c846f5438a451c6e0b845505cafba0bd51527c191f9fadb8bfd7321
+  data.tar.gz: d44890b934d08df1bfe4f49b9d769019ca4849e43410dcc7488f7e887164bc3db6606fe2f109e9f5f2f5feca26847c4c77eca1f02d9e8a1b4bde8fba0ae377d0

data/exe/entangler

@@ -1,21 +1,65 @@
 #!/usr/bin/env ruby
-require "entangler"
+require 'entangler'
+require 'optparse'
 
-mode = ARGV[0]
-opts = {}
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage:\n   entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]\n   entangler slave <base_dir> [options]"
 
-raise 'Must supply at least 2 args' unless ARGV.length >= 2
+  opts.separator ""
+  opts.separator "Options:"
+
+  opts.on("-p", "--port PORT", "Overwrite the SSH port (usually 22)", "(doesn't do anything in slave mode)") do |port|
+    options[:port] = port
+  end
+
+  opts.on_tail("-v", "--version", "Show version number") do |v|
+    puts Entangler::VERSION
+    exit
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end.parse!
+
+mode = ARGV.shift
+unless mode && ['master', 'slave'].include?(mode)
+  puts "Mode unknown, please read help:\nentangler -h"
+  exit 1
+end
+
+base_dir = ARGV.shift
+unless base_dir
+  puts "Missing base directory"
+  exit 1
+end
 
 if mode == 'master'
-  raise 'Missing remote argument' unless ARGV.length >= 3
-  user, rest = ARGV[2].split('@', 2)
-  host, path = rest.split(':', 2)
+  remote_information = ARGV.shift
+
+  unless remote_information
+    raise 'Missing remote information'
+    exit 1
+  end
+
+  user, rest = remote_information.split('@', 2)
+  host, path = (rest || '').split(':', 2)
+
+  error = nil
+  error = 'Missing remote user' unless user
+  error = 'Missing remote host' unless host
+  error = 'Missing remote path' unless path
+  unless error.nil?
+    puts error
+    exit 1
+  end
+
   opts = {remote_base_dir: path, remote_user: user, remote_host: host}
-  opts[:remote_port] = ARGV[3] if ARGV[3]
-elsif mode == 'slave'
-  opts[:mode] = 'slave'
+  opts[:remote_port] = options[:port] if options[:port]
 else
-  raise "Mode: #{mode} unknown, please read documentation"
+  opts = {mode: 'slave'}
 end
 
-Entangler.run(ARGV[1], opts)
+Entangler.run(base_dir, opts)

data/lib/entangler/version.rb

@@ -1,3 +1,3 @@
 module Entangler
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dave Allie