etcd-completion 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 838c65b812cf27f31626684e15e71e7459c6d896
-  data.tar.gz: cee0dab9d704ae70f10f7ca1b0939381cd011579
+  metadata.gz: ef72e192e9d4f8bcddac95655bf6388c24fdd1ad
+  data.tar.gz: 6872c7b5aa8bebd8eb4c70b93d50a2921be8b9fd
 SHA512:
-  metadata.gz: a63fa945007f5c6b161801993ae49cddd31c0c4200d1df1d44945725a6bb1813a81d655a7880947dd63721e6b9f40ff6e8700034deb440601ebb3627d8ea2e0b
-  data.tar.gz: 38860b79acf047643e36aafd5b00b49cae64731c7dcbef7e0c409b8006c206cfd139477e5b031c4dc28cae6ec24996f21d4e4558606f93428acc58fa0825b832
+  metadata.gz: ab9a0a0b5b93acc1c7e43790b5e51a589aab6995cf9d149da7fb215f0b13a22bcff9c000215127ddb8393f937228b563cd44bde118fe78fe544803136ad1d2e2
+  data.tar.gz: 3700fab2ed814c1c9c4f58ab8ad6ce7d8bbf151054825631a5ddb8035d510ed149d12249a8433836163ad5cb003ccfc4e9c99607b2f1a042bab8160ef65fa2a8

data/Rakefile

@@ -1 +1,8 @@
-require "bundler/gem_tasks"
+# Optional require
+def optional(path)
+  require path
+rescue LoadError
+end
+
+optional 'bundler/gem_tasks'
+optional 'rspec/core/rake_task'

data/bin/etcd-completion

@@ -1,65 +1,23 @@
 #!/usr/bin/env ruby
-require 'etcd'
-
-def dir_ops 
-  %w'mkdir rmdir ls setdir updatedir'
-end
-
-def node_ops
-  %w'mk rm get set update watch'
-end
+require 'etcd-completion'
 
 def filter(prefix, key)
   key.start_with?(prefix)
 end
 
 def completions(op, prefix)
-  prefix = '' if prefix.nil?
-  if node_ops.include? op
-    type = 'node'
-  elsif dir_ops.include? op
-    type = 'dir'
-  else
-    fail "Usage: etcdctl.rb <operation> <prefix>"
-  end
-
-  client = Etcd.client
+  prefix = '/' if prefix.nil?
 
-  if (prefix == '/') 
-    node_name = '/'
-  else
-    index = prefix.rindex('/')
-    if index.nil?
-      node_name = '/'
-    else
-      node_name = prefix[0, prefix.rindex('/')+1]
-    end
-  end
+  completion = Etcd::Completion.new
+  matches = completion.matches(prefix)
 
-  node = client.get(node_name)
-  if node.directory?
-    children = node.children
-    case type
-    when 'dir' 
-      result = children.select{|c|c.directory? && filter(prefix, c.key)}.map do |c|
-        c.key + '/'
-      end
-    when 'node' 
-      result = children.select{|c|filter(prefix, c.key)}.map do |c|
-        c.directory? ? (c.key + '/') : (c.key)
-      end
-    end 
-  else
-    result = [filter(prefix, node.key)]
+  if Etcd::Operation.new(op).directory_only?
+    matches = matches.select{|m| m.directory?}
   end
 
-  if (result.size == 1)
-    new_prefix = result[0]
-    if new_prefix.end_with?('/')
-      result << completions(op, new_prefix) 
-    end
+  matches.map do |m|
+    (m.directory? && m.key != '/') ? m.key + '/' : m.key
   end
-  result
 end
 
 puts completions(ARGV[0], ARGV[1]).join(' ') 

data/etcd-completion.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'etcd/completion/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "etcd-completion"
-  spec.version       = Etcd::Completion::VERSION
+  spec.version       = "0.0.4"
   spec.authors       = ["Michael Shea"]
   spec.email         = ["mike.shea@gmail.com"]
   spec.summary       = %q{Utility for etcd autocompletion}
@@ -20,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-
+  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_dependency 'etcd', "~> 0.2"
 end

data/lib/etcd-completion.rb

@@ -0,0 +1,55 @@
+require 'etcd'
+module Etcd
+
+  class Operation
+    attr_reader :name
+    def initialize(name)
+      @name = name
+    end
+
+    def directory_only?
+      %w'mkdir rmdir ls setdir updatedir'.include? name
+    end
+  end
+
+  class Completion
+    attr_reader :client
+
+    def initialize(opts={})
+      @client = opts[:client] || Etcd.client(opts)
+    end
+
+    def node_name(prefix)
+      if (prefix == '/')
+        '/' 
+      else
+        index = prefix.rindex('/')
+        if index.nil?
+          '/' 
+        else
+          prefix[0..index]
+        end
+      end
+    end
+
+    def filter(nodes, prefix) 
+      nodes.select do |n|
+        n.key.start_with?(prefix)
+      end
+    end
+
+    def matches(prefix)
+      node = client.get(node_name(prefix)).node
+      nodes = [node] + node.children
+      nodes = filter(nodes, prefix)
+
+      if nodes.size == 1  
+        if nodes[0].directory?
+          nodes += client.get(nodes[0].key).node.children
+        end
+      end
+
+      nodes
+    end 
+  end
+end

data/spec/etcd-completion_spec.rb

@@ -0,0 +1,73 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rspec'
+require 'simplecov'
+SimpleCov.start
+require 'etcd-completion'
+
+module Etcd
+  %w'mkdir rmdir ls setdir updatedir'.each do |op|
+    describe "#{op} #directory_only?" do
+      let(:operation){ Operation.new(op) }
+      it 'should be true' do
+        expect(operation.directory_only?).to eq(true)
+      end
+    end
+  end
+
+  describe Completion do
+    describe '#matches' do
+      let (:completion){ Completion.new(:client=>client) }
+      let (:client) { double('client') }
+
+      it 'should return matches for the prefix' do
+        allow(client).to receive(:get).with('/'){root}
+        expect(completion.matches('/prefix').map(&:key)).to eq %w'/prefix1 /prefix2 /prefix3'
+      end
+
+      it 'should include children if only one immediate dir match' do
+        allow(client).to receive(:get).with('/'){root}
+        allow(client).to receive(:get).with('/prefix1'){subdir}
+        expect(completion.matches('/prefix1').map(&:key)).to eq %w'/prefix1 /prefix1/key' 
+      end
+    end
+
+    def subdir
+      double('subdir-result').tap do |r|
+        allow(r).to receive(:node) {
+          dir('/prefix1', [ key('/prefix1/key') ])
+        }
+      end
+    end
+
+    def root
+      double('result').tap do |r|
+        allow(r).to receive(:node) do 
+          dir(
+            '/', 
+            [
+              dir('/prefix1'),
+              dir('/prefix2'),
+              key('/prefix3')
+            ])
+        end 
+      end   
+    end
+
+    def dir(name, children=[])
+      node(name, true).tap do |n|
+        allow(n).to receive(:children){children}
+      end
+    end
+
+    def key(name) 
+      node(name, false)
+    end
+
+    def node(name, directory)
+      double(name).tap do |n|
+        allow(n).to receive(:key){name}
+        allow(n).to receive(:directory?){directory}
+      end
+    end
+  end
+end

data/travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+cache: bundler
+rvm:
+  - 2.1.0
+  - 1.9.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcd-completion
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Shea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: etcd
   requirement: !ruby/object:Gem::Requirement
@@ -67,8 +95,9 @@ files:
 - Rakefile
 - bin/etcd-completion
 - etcd-completion.gemspec
-- lib/etcd/completion.rb
-- lib/etcd/completion/version.rb
+- lib/etcd-completion.rb
+- spec/etcd-completion_spec.rb
+- travis.yml
 homepage: ''
 licenses:
 - MIT
@@ -93,4 +122,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Utility for etcd autocompletion
-test_files: []
+test_files:
+- spec/etcd-completion_spec.rb

data/lib/etcd/completion.rb

@@ -1,7 +0,0 @@
-require "etcd/completion/version"
-
-module Etcd
-  module Completion
-    # Your code goes here...
-  end
-end

data/lib/etcd/completion/version.rb

@@ -1,5 +0,0 @@
-module Etcd
-  module Completion
-    VERSION = "0.0.2"
-  end
-end