consul-migrate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzA5ODIyY2UzNmNmNjk1M2EzMTZhMzI1ZmFiNDVjYWM5YzEzMDYwMQ==
+    MWY0MGEzNDA0ZjFkYjQwNDI5ZmNhYTE5MzNkYzZjZmNhYjQ2NWJkOQ==
   data.tar.gz: !binary |-
-    MWU4YTM4YmZiMjkzNWQ0MDI4MmJiMDM4M2UwNWQyY2U2MTRlZGVhZA==
+    OWNjYTE0ZGZjNWFiZDczOTdjMTI2MWQyNTg4ZDIwYjA4NjRlNTEyNA==
 SHA512:
   metadata.gz: !binary |-
-    NDQ1ZjcyOTA5MTk0MjAzNDE2YzYyMDhhZDFlNTk1YTBkOWRhMWVjYmYyZWIx
-    M2ZmZDE1OTI2YzgzYzU4NDM1N2E4ZTczY2UwZDIyMDk3NzM2ODk2MTdiY2Vi
-    ZTE2YzYwODc2OTYxNTU0NzZmNDEzOWZjYzZjMzdmMGY5NjdmODE=
+    OGFiN2VjM2VlNTA4OTZhN2E4ODkzMzgxZDlkYzQ4YzljYjc2ZTI4ZWY4ZjZh
+    NzdlZTUxMDA1NjUxOWJmZWI4YWNlYTRhNGNhYTZlM2E0OGMxMWQ3OWM1YmNj
+    NzIwNDJmNWVmMTcwMTI4YjYxNWZkZWM1MGIwMzMxZTZjYTc0MTI=
   data.tar.gz: !binary |-
-    ZWI3MjNhMTBhOTUzNmQ4MzA4OWRkMGRiN2NiNGY0YTIyZjZlMzFjOWE3ZDU3
-    OGMzMTVmYjgxODQxYTNhMzE1MmQ1YmY3MGIzMTM3NzE3MTA0OWU3ODdmMmUz
-    ZmY3N2MxODZhZDljZDZiMWRlMzRhZDI4MGY1ZjhlNGYxODk0ZmI=
+    ODIzNWMyNjVmMjgyNzExZWY0MmQ2ZWVmNjk5ZDcwMTUyMTdjNDk2MjJjMDhl
+    NmZhMzliNTNiYWNhMDNiYWE5MGJhYjViZWE3MWI0MzM2MDkyNGM4MzI0Njk4
+    OTcwOGM5Y2NhYWViNGEyMmQ2Y2U2YWIyZTViOWU0YTllYmU2NDY=

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+- 1.9.3
 - 2.0.0
 deploy:
   provider: rubygems

data/README.md

@@ -22,16 +22,16 @@ Or install it yourself as:
 From the current authoritative ACL datacenter:
 
 ```ruby
-require consul-migrate
+require 'consul/migrate'
 
-client = Consul::Migrate::Client.new(acl_token: 'you-acl-master-token')
+client = Consul::Migrate::Client.new(acl_token: 'your-acl-master-token')
 client.export_acls('/path/to/file')
 ```
 
 From the desired new ACL datacenter:
 ```ruby
-require consul-migrate
-client = Consul::Migrate::Client.new(acl_token: 'you-acl-master-token')
+require 'consul/migrate'
+client = Consul::Migrate::Client.new(acl_token: 'your-acl-master-token')
 client.import_acls('/path/to/file')
 ```
 

data/bin/consul-migrate

@@ -0,0 +1,4 @@
+#! ruby
+require 'consul/migrate/cli'
+
+Consul::Migrate::Cli.start(ARGV)

data/consul-migrate.gemspec

@@ -15,14 +15,16 @@ Gem::Specification.new do |spec|
   spec.license       = 'Apache 2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = 'bin'
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'webmock', '~> 1.21.0'
-  spec.add_development_dependency 'rspec', '~> 3.1.0'
+  spec.add_development_dependency 'webmock', '~> 1.21'
+  spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'sinatra', '~> 1.4'
   spec.add_development_dependency 'fakefs', '~> 0.6'
+
+  spec.add_runtime_dependency 'thor', '~> 0.19'
 end

data/lib/consul/migrate.rb

@@ -1,4 +1,5 @@
 require 'consul/migrate/client'
+require 'consul/migrate/cli'
 require 'consul/migrate/version'
 
 module Consul

data/lib/consul/migrate/cli.rb

@@ -0,0 +1,71 @@
+require 'consul/migrate/version'
+require 'consul/migrate/client'
+require 'consul/migrate/defaults'
+require 'thor'
+require 'yaml'
+require 'fileutils'
+
+module Consul
+  module Migrate
+    class Cli < Thor
+
+      attr_accessor :client
+
+      def initialize(*args)
+        super
+        read_config
+      end
+
+      desc 'version', 'Display consul-migrate version'
+      def version
+        say VERSION
+      end
+
+      desc 'init', 'Initialize consul-migrate instance'
+      method_option :bind_client, type: :string, aliases: :c,
+                    desc: 'HTTPS client to bind to'
+      method_option :port, type: :numeric, aliases: :p,
+                    desc: 'Port to bind to'
+      method_option :acl_token, type: :string, aliases: :t,
+                    desc: 'ACL token that is used to access API'
+      def init
+        write_config(options)
+      end
+
+      desc 'export', 'Export ACLs from Consul via agent running in this system'
+      method_option :file, type: :string, default: 'output.json', aliases: :f,
+                    desc: 'Target file to write to'
+      def export
+        @client.export_acls(options[:file])
+      end
+
+      desc 'import', 'Import ACLs into Consul cluster via agent running in this system'
+      method_option :file, type: :string, default: 'output.json', aliases: :f,
+                    desc: 'Target file to read from'
+      def import
+        @client.import_acls(options[:file])
+      end
+
+      private
+
+      def write_config(options)
+        parent_dir = File.dirname(CONFIG_FILE)
+        FileUtils.mkdir_p parent_dir
+
+        client = Consul::Migrate::Client.new(options)
+
+        File.open(CONFIG_FILE, 'w') do |f|
+          # Convert keys from symbols to string and turn hash into YAML
+          f.write client.options.to_yaml
+        end
+      end
+
+      def read_config
+        return unless File.exists?(CONFIG_FILE)
+
+        config = YAML.load_file(CONFIG_FILE)
+        @client = Consul::Migrate::Client.new(config)
+      end
+    end
+  end
+end

data/lib/consul/migrate/client.rb

@@ -1,47 +1,59 @@
 require 'json'
 require 'net/http'
+require 'consul/migrate/defaults'
+require 'consul/migrate/error'
 
 module Consul
   module Migrate
     class Client
+      # Make options readable to CLI
       attr_reader :options
 
-      def bind_client; options[:bind_client]; end
-      def port;        options[:port];        end
-      def acl_token;   options[:acl_token];   end
-      def base_url;    "http://#{bind_client}:#{port}"; end
+      def bind_client; @options[:bind_client]; end
+      def port;        @options[:port];        end
+
+      def base_url
+        "http://#{bind_client}:#{port}"
+      end
+
+      def http_params
+        { :token => @options[:acl_token] }
+      end
 
       def initialize(options = {})
-        @options = {
-          :bind_client => 'localhost',
-          :port        => 8500
-        }.merge(options)
+        @options = CLIENT_DEFAULTS.merge(symbolize_keys(options))
       end
 
-      # Get all ACLs
+      # GET /v1/acl/list
       def get_acl_list
-        url = "#{base_url}/v1/acl/list?token=#{acl_token}"
-        response = Net::HTTP.get_response(URI.parse(url))
+        uri = URI("#{base_url}/v1/acl/list")
+        uri.query = URI.encode_www_form(http_params)
+        response = Net::HTTP.get_response(uri)
 
-        return response
+        fail(Error, response.body) unless response.kind_of? Net::HTTPSuccess
+
+        response.body
       end
 
-      # PUT single ACL
+      # PUT /v1/acl/create
       def put_acl(acl_hash)
-        uri = URI("#{base_url}/v1/acl/create?token=#{acl_token}")
-        req = Net::HTTP::Put.new(uri)
+        uri = URI("#{base_url}/v1/acl/create")
+        uri.query = URI.encode_www_form(http_params)
+        req = Net::HTTP::Put.new(uri.request_uri)
         req.body = acl_hash.to_json
 
         response = Net::HTTP.start(uri.hostname, uri.port) do |http|
           http.request(req)
         end
 
-        return response
+        fail(Error, response.body) unless response.kind_of? Net::HTTPSuccess
+
+        response.body
       end
 
       # Export ACLs into a file
       def export_acls(dest)
-        json = get_acl_list.body
+        json = get_acl_list
 
         File.open(dest, 'w') { |file|
           file.write(json)
@@ -58,13 +70,18 @@ module Consul
 
         result = []
         data_hash.each do |k, v|
-          h = JSON.parse(put_acl(k).body)
+          h = JSON.parse(put_acl(k))
           result.push(h)
         end
 
         return result
       end
 
+      private
+
+      def symbolize_keys(hash)
+        Hash[hash.map{|k,v| v.is_a?(Hash) ? [k.to_sym, symbolize_keys(v)] : [k.to_sym, v] }]
+      end
     end
   end
 end

data/lib/consul/migrate/defaults.rb

@@ -0,0 +1,10 @@
+module Consul
+  module Migrate
+    CLIENT_DEFAULTS = {
+      :bind_client => 'localhost',
+      :port        => 8500
+    }
+  end
+
+  CONFIG_FILE = File.join(Dir.home, '.cmigrate/init.conf')
+end

data/lib/consul/migrate/error.rb

@@ -0,0 +1,8 @@
+module Consul
+  module Migrate
+  # A standard error with a different name
+  # for identifying errors internal to this gem
+    class Error < StandardError
+    end
+  end
+end

data/lib/consul/migrate/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Migrate
-    VERSION = "0.1.1"
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-migrate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Calvin Leung Huang
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -94,10 +94,25 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.19'
 description: Gem that can be used to import and export Consul ACL tokens
 email:
 - cleung2010@gmail.com
-executables: []
+executables:
+- consul-migrate
 extensions: []
 extra_rdoc_files: []
 files:
@@ -108,11 +123,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
+- bin/consul-migrate
 - consul-migrate.gemspec
 - lib/consul/migrate.rb
+- lib/consul/migrate/cli.rb
 - lib/consul/migrate/client.rb
+- lib/consul/migrate/defaults.rb
+- lib/consul/migrate/error.rb
 - lib/consul/migrate/version.rb
 homepage: https://github.com/Cimpress-MCP/consul-migrate
 licenses:

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "consul/migrate"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here