vaulty 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e424ce87a9674979f10dad0855b27a2fa76763c4
-  data.tar.gz: bd26c4d66ac5b7d1da3b85fac301a3c761342fe0
+  metadata.gz: 7c7dbd18027d85422fd9b764cabc3acb107bbd3f
+  data.tar.gz: da99bc09d1f9c4334c712680abadbf206792d470
 SHA512:
-  metadata.gz: ea10a384993cae89b6ef4bf52375aaf2038dd8f87640890f082767281a8583fa2e28dd4bef28ce0b323850bb56858a3cac05e4614b09d8b294fe3b422494899c
-  data.tar.gz: '0994e597a90351fc5a33059df95f30f2a1198c2b5597e8909415a64f45d5382637a33e257b679e3b92279ad831e9f721d61325c09a6e63010b9b689b058130b7'
+  metadata.gz: 3c724876d426647cb1786e74fcf8bbeb6de6f0bb80181a2f3a6d4b395e5fb8652a9ee013ad2b9195af74ca9c873827713ee1a5de36965be2df6dc5e3915c629d
+  data.tar.gz: b44b647ca87762201faa9a48c6676939d287851c92d30c26cbc82d984c53d5c3bf3095f0219228ea1de6c15bcac80827d9b7de390f6016a2eaa45702b9785789

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -6,7 +6,7 @@ cache: bundler
 before_install:
   - curl -sLo vault.zip https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip
   - unzip vault.zip
-  - mkdir ~/bin
+  - mkdir -p ~/bin
   - mv vault ~/bin
   - export PATH="~/bin:$PATH"
   - gem update --remote bundler
@@ -16,10 +16,11 @@ install:
 
 env:
   - VAULT_VERSION=0.7.0
+  - VAULT_VERSION=0.8.3
 
 rvm:
-  - 2.3.1
-  - 2.4.1
+  - 2.3.5
+  - 2.4.2
 
 script:
   - 'bundle exec rake spec'

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'aruba'
+  gem 'activesupport'
   gem 'codeclimate-test-reporter', '~> 1.0.0'
   gem 'coveralls', require: false
   gem 'rdoc'

data/README.md

@@ -1,7 +1,8 @@
-# Vaulty 
-[![Build Status](https://travis-ci.org/playpasshq/vaulty.svg?branch=master)](https://travis-ci.org/playpasshq/vaulty) 
-[![Coverage Status](https://coveralls.io/repos/github/playpasshq/vaulty/badge.svg?branch=master)](https://coveralls.io/github/playpasshq/vaulty?branch=master) 
-[![Code Climate](https://codeclimate.com/github/playpasshq/vaulty/badges/gpa.svg)](https://codeclimate.com/github/playpasshq/vaulty) 
+# Vaulty
+[![Gem Version](https://badge.fury.io/rb/vaulty.svg)](https://badge.fury.io/rb/vaulty)
+[![Build Status](https://travis-ci.org/playpasshq/vaulty.svg?branch=master)](https://travis-ci.org/playpasshq/vaulty)
+[![Test Coverage](https://codeclimate.com/github/playpasshq/vaulty/badges/coverage.svg)](https://codeclimate.com/github/playpasshq/vaulty/coverage)
+[![Code Climate](https://codeclimate.com/github/playpasshq/vaulty/badges/gpa.svg)](https://codeclimate.com/github/playpasshq/vaulty)
 [![Issue Count](https://codeclimate.com/github/playpasshq/vaulty/badges/issue_count.svg)](https://codeclimate.com/github/playpasshq/vaulty)
 [![Dependency Status](https://gemnasium.com/badges/github.com/playpasshq/vaulty.svg)](https://gemnasium.com/github.com/playpasshq/vaulty)
 [![Inline docs](http://inch-ci.org/github/playpasshq/vaulty.svg)](http://inch-ci.org/github/playpasshq/vaulty)

data/Rakefile

@@ -6,8 +6,8 @@ require 'bundler/gem_tasks'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts 'Run `bundle install` to install missing gems'
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 

data/lib/vaulty/cli/add.rb

@@ -4,9 +4,11 @@ module Vaulty
       attr_reader :catacomb, :data
       # @param [Catacomb] catacomb instance
       # @param [Hash] data
-      def initialize(catacomb:, data:)
+      # @param [Hash] files
+      def initialize(catacomb:, data: {}, files: {})
         @catacomb = catacomb
-        @data = data
+        files_with_content = read_file_contents!(files)
+        @data = data.merge(files_with_content)
       end
 
       def call
@@ -27,6 +29,16 @@ module Vaulty
       def matching_keys
         @matching_keys ||= catacomb.matching_keys(data.keys)
       end
+
+      def read_file_contents!(files)
+        files.each_with_object({}) do |(key, path), memo|
+          memo[key] = read_file(path)
+        end
+      end
+
+      def read_file(path)
+        File.read(File.expand_path(path))
+      end
     end
   end
 end

data/lib/vaulty/cli/command.rb

@@ -1,21 +1,45 @@
 module Vaulty
   module CLI
     class Command
-      def banner(msg, color: :green)
-        Vaulty::Output::Banner.render(msg, color: color)
+      # Interface method should be defined by subclasses
+      # @raise [NotImplementedError]
+      #
+      def call
+        raise NotImplementedError, "#{inspect}.call is not implemented"
       end
 
-      def table(data, highlight: {})
-        Vaulty::Output::Table.render(data, highlight: highlight)
+      # Render a banner
+      # @see Vaulty::Output::Banner
+      # @param [String] msg to be placed in the banner
+      # @param [Symbol] color optional color
+      #
+      def banner(msg, color: :green)
+        Vaulty::Output::Banner.render(msg, color: color, prompt: prompt)
       end
 
-      def prompt
-        @prompt ||= TTY::Prompt.new
+      # Renders a table
+      # @param [Array<Array>] data row/columns
+      # @param [Hash] highlgiht options passed to (see Vaulty::Output::HighlightFilter)
+      # @option highlight [Array] :matching strings to highlight
+      # @option highlight [Symbol] :color to be used for highlighting
+      #
+      def table(data, highlight: {})
+        Vaulty::Output::Table.render(data, highlight: highlight, prompt: prompt)
       end
 
+      # Initializes a new command with the args and calls it
+      # @param [Hash] args anything
+      #
       def self.call(*args)
         new(*args).call
       end
+
+      # Returns an instance of {TTY::Prompt}
+      # @return [TTY::Prompt] instance
+      #
+      def prompt
+        Vaulty.prompt
+      end
     end
   end
 end

data/lib/vaulty/cli/delete.rb

@@ -9,7 +9,7 @@ module Vaulty
       def call
         banner("Current value #{catacomb.path.inspect}")
         # Render the tree first so the user knows what we will delete
-        Vaulty::CLI::Tree.call(catacomb)
+        vaulty_tree = Vaulty::CLI::Tree.call(catacomb: catacomb)
         # Confirmation
         return if prompt.no?('All above data will be ' \
                               'recursively deleted! Are you sure?', color: :red)
@@ -27,7 +27,7 @@ module Vaulty
       def delete_recursively(tree, path = [])
         Array(tree).each do |folder|
           current_path = path + [folder.name]
-          Catacomb.delete(current_path.join('/')) unless folder.data.empty?
+          Vaulty.catacomb.delete(current_path.join('/')) unless folder.data.empty?
           delete_recursively(folder.children, current_path) unless folder.children.empty?
         end
       end

data/lib/vaulty/cli/tree.rb

@@ -1,12 +1,6 @@
 module Vaulty
   module CLI
     class Tree < Command
-      class Empty < GLI::CustomExit
-        def initialize(path)
-          super("Path #{path.inspect} contains nothing", -1)
-        end
-      end
-
       attr_reader :catacomb
       # @param [Catacomb] catacomb instance
       def initialize(catacomb:)
@@ -19,8 +13,9 @@ module Vaulty
         vaulty_tree = Vaulty::VaultTree.new(catacomb: catacomb).tree
         spinner.stop
 
-        raise Empty, catacomb.path if vaulty_tree.empty?
-        Vaulty::Output::Tree.render(vaulty_tree)
+        raise Vaulty::EmptyPath, catacomb.path if vaulty_tree.empty?
+        Vaulty::Output::Tree.render(vaulty_tree, prompt: prompt)
+        vaulty_tree
       end
     end
   end

data/lib/vaulty/cli_app.rb

@@ -2,7 +2,7 @@ module Vaulty
   class CLIApp
     extend GLI::App
 
-    program_desc 'Describe your application here'
+    program_desc 'Vault CLI on steriods'
 
     version Vaulty::VERSION
 
@@ -13,24 +13,20 @@ module Vaulty
       Hash[*value.split(':')]
     end
 
-    desc 'Describe some switch here'
-    switch %i(s switch)
-
-    desc 'Describe some flag here'
-    default_value 'the default'
-    arg_name 'The name of the argument'
-    flag %i(f flagname)
-
     desc 'Add a new key/value to the given `PATH`, multiple `key:value` can be provided'
     arg(:path)
     command :add do |c|
       c.flag %i(secret s), desc: 'Key/Values to save', type: Array, multiple: true,
                            required: true, arg_name: 'key:secret'
 
+      c.flag %i(file f), desc: 'Key/File to be uploaded', type: Array, multiple: true,
+                         arg_name: 'key:/path/file.ext'
+
       c.action do |_global_options, options, _args|
         data = options[:secret].reduce({}, :merge)
+        files = options[:file].reduce({}, :merge)
         catacomb = options[:catacomb]
-        Vaulty::CLI::Add.call(catacomb: catacomb, data: data)
+        Vaulty::CLI::Add.call(catacomb: catacomb, data: data, files: files)
       end
     end
 
@@ -52,80 +48,10 @@ module Vaulty
       end
     end
 
-    desc 'Describe backup here'
-    arg_name 'Describe arguments to backup here'
-    command :backup do |c|
-      c.action do |_global_options, _options, _args|
-        puts 'backup command ran'
-      end
-    end
-
-    desc 'Describe convert here'
-    arg_name 'Describe arguments to convert here'
-    command :convert do |c|
-      c.action do |_global_options, _options, _args|
-        puts 'convert command ran'
-      end
-    end
-
-    desc 'Describe diff here'
-    arg_name 'Describe arguments to diff here'
-    command :diff do |c|
-      c.action do |_global_options, _options, _args|
-        puts 'diff command ran'
-      end
-    end
-
-    desc 'Describe generate here'
-    arg_name 'Describe arguments to generate here'
-    command :generate do |c|
-      c.action do |_global_options, _options, _args|
-        puts 'generate command ran'
-      end
-    end
-
-    desc 'Describe provision here'
-    arg_name 'Describe arguments to provision here'
-    command :provision do |c|
-      c.action do |_global_options, _options, _args|
-        puts 'provision command ran'
-      end
-    end
-
-    desc 'Describe remove here'
-    arg_name 'Describe arguments to remove here'
-    command :remove do |c|
-      c.action do |_global_options, _options, _args|
-        puts 'remove command ran'
-      end
-    end
-
-    desc 'Describe restore here'
-    arg_name 'Describe arguments to restore here'
-    command :restore do |c|
-      c.action do |_global_options, _options, _args|
-        puts 'restore command ran'
-      end
-    end
-
-    desc 'Describe write here'
-    arg_name 'Describe arguments to write here'
-    command :write do |c|
-      c.action do |_global_options, _options, _args|
-        puts 'write command ran'
-      end
-    end
-
     pre do |_global, _command, options, args|
       path = args.first
       exit_now!('path must be provided') if path.nil? || path.empty?
-      options[:catacomb] = Vaulty::Catacomb.new(path)
-    end
-
-    post do |global, command, options, args|
-      # Post logic here
-      # Use skips_post before a command to skip this
-      # block on that command only
+      options[:catacomb] = Vaulty.catacomb.new(path)
     end
 
     on_error do |_exception|

data/lib/vaulty/output/banner.rb

@@ -3,10 +3,10 @@ module Vaulty
     class Banner
       attr_reader :msg, :prompt, :color
 
-      def initialize(msg, color: :blue)
+      def initialize(msg, color: :blue, prompt:)
         @msg = msg
         @color = "on_#{color}".to_sym
-        @prompt = TTY::Prompt.new
+        @prompt = prompt
       end
 
       def render

data/lib/vaulty/output/table.rb

@@ -20,16 +20,16 @@ module Vaulty
       DEFAULT_HEADER = %w(Key Value).freeze
       attr_reader :data, :prompt, :header
 
-      def initialize(data, header: DEFAULT_HEADER, highlight: {})
+      def initialize(data, header: DEFAULT_HEADER, highlight: {}, prompt:)
         @data = data
-        @prompt = TTY::Prompt.new
         @filter = HighlightFilter.new(**highlight)
         @header = header
+        @prompt = prompt
       end
 
       def render
         table = TTY::Table.new(data, header: header, style: :markdown)
-        renderer = table.render(:ascii) do |render|
+        renderer = table.render(:ascii, column_widths: [30, 80]) do |render|
           render.padding = [0, 2, 0, 2]
           render.filter = @filter
         end

data/lib/vaulty/output/tree.rb

@@ -1,19 +1,19 @@
 module Vaulty
   module Output
     class Tree
-      attr_reader :tree, :value_icon, :dir_icon
+      attr_reader :tree, :prompt
 
-      def initialize(tree, value_icon: "\u{1F511}", dir_icon: "\u{1F4C2}")
+      def initialize(tree, prompt:)
         @tree = tree
-        @value_icon = value_icon
-        @dir_icon = dir_icon
+        @prompt = prompt
       end
 
       def render
         output_tree = flatten_tree(Array(tree), 0)
-        puts Hirb::Helpers::Tree.render(output_tree,
+        rendered_tree = Hirb::Helpers::Tree.render(output_tree,
           type: :directory,
           multi_line_nodes: true)
+        prompt.say(rendered_tree)
       end
 
       def self.render(*args)
@@ -35,12 +35,12 @@ module Vaulty
       def format_values(values, level)
         Array(values).map do |value|
           key_value = "#{value.key}:#{value.value}"
-          { value: [value_icon, key_value].compact.join('  '), level: level }
+          { value: ["\u{1F511}", key_value].compact.join('  '), level: level }
         end
       end
 
       def format_node(value, level)
-        { value: [dir_icon, value].compact.join('  '), level: level }
+        { value: ["\u{1F4C2}", value].compact.join('  '), level: level }
       end
     end
   end

data/lib/vaulty/vault_tree.rb

@@ -51,7 +51,7 @@ module Vaulty
     end
 
     def find_subtree(base_path)
-      list = Catacomb.list(base_path)
+      list = Vaulty.catacomb.list(base_path)
       list.map do |folder|
         file_or_folder = [base_path, folder].join('/')
         values = read_values_for(file_or_folder)
@@ -64,7 +64,7 @@ module Vaulty
     end
 
     def read_values_for(path)
-      Catacomb.read(path).map do |key, value|
+      Vaulty.catacomb.read(path).map do |key, value|
         Value.new(key: key, value: value)
       end
     end

data/lib/vaulty/version.rb

@@ -1,3 +1,3 @@
 module Vaulty
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/lib/vaulty.rb

@@ -16,8 +16,36 @@ require 'vaulty/vault_tree'
 
 require 'vaulty/cli/command'
 require 'vaulty/cli/add'
+require 'vaulty/cli/delete'
 require 'vaulty/cli/tree'
 
 require 'vaulty/output/banner'
 require 'vaulty/output/table'
 require 'vaulty/output/tree'
+
+module Vaulty
+  # This error is raised when we try to show / operate on a path
+  # that does not contain anything
+  # @see GLI::CustomExit
+  #
+  class EmptyPath < GLI::CustomExit
+    # @param [String] path
+    def initialize(path)
+      super("Path #{path.inspect} contains nothing", -1)
+    end
+  end
+
+  # Returns the prompt instance so it's always the same instance
+  # @return [TTY::Prompt]
+  #
+  def self.prompt
+    @prompt ||= TTY::Prompt.new
+  end
+
+  # Returns the Catacomb class
+  # @return [Vaulty::Catacomb]
+  #
+  def self.catacomb
+    @catacomb ||= Vaulty::Catacomb
+  end
+end

data/vaulty.gemspec

@@ -17,16 +17,17 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+
   s.bindir = 'bin'
   s.require_paths << 'lib'
   s.executables << 'vaulty'
 
-  s.add_dependency 'vault', '~> 0.9'
+  s.add_dependency 'hashdiff', '~> 0.3.0'
   s.add_dependency 'hirb', '~> 0.7.3'
   s.add_dependency 'tty', '~> 0.7.0'
-  s.add_dependency 'hashdiff', '~> 0.3.0'
+  s.add_dependency 'vault', '~> 0.10.1'
 
   s.add_development_dependency 'rake'
 
-  s.add_runtime_dependency 'gli', '2.16.0'
+  s.add_runtime_dependency 'gli', '2.17.0'
 end

data/vaulty.rdoc

@@ -1,25 +1,13 @@
-== vaulty - Describe your application here
+== vaulty - Vault CLI on steriods
 
 v0.0.1
 
 === Global Options
-=== -f|--flagname The name of the argument
-
-Describe some flag here
-
-[Default Value] the default
-
-
 === --help
 Show this message
 
 
 
-=== -s|--[no-]switch
-Describe some switch here
-
-
-
 === --version
 Display the program version
 
@@ -31,33 +19,24 @@ Add a new key/value to the given `PATH`, multiple `key:value` can be provided
 
 
 ===== Options
-===== --secret|-s key:secret
+===== --file|-f key:/path/file.ext
 
-Key/Values to save
+Key/File to be uploaded
 
 [Default Value] None
 
 
-==== Command: <tt>backup  Describe arguments to backup here</tt>
-Describe backup here
+===== --secret|-s key:secret
 
+Key/Values to save
 
-==== Command: <tt>convert  Describe arguments to convert here</tt>
-Describe convert here
+[Default Value] None
 
 
 ==== Command: <tt>delete </tt>
 Deletes everything under the path recursively
 
 
-==== Command: <tt>diff  Describe arguments to diff here</tt>
-Describe diff here
-
-
-==== Command: <tt>generate  Describe arguments to generate here</tt>
-Describe generate here
-
-
 ==== Command: <tt>help  command</tt>
 Shows a list of commands or help for one command
 
@@ -68,23 +47,7 @@ List commands one per line, to assist with shell completion
 
 
 
-==== Command: <tt>provision  Describe arguments to provision here</tt>
-Describe provision here
-
-
-==== Command: <tt>remove  Describe arguments to remove here</tt>
-Describe remove here
-
-
-==== Command: <tt>restore  Describe arguments to restore here</tt>
-Describe restore here
-
-
 ==== Command: <tt>tree </tt>
 Represents the path as a tree
 
 
-==== Command: <tt>write  Describe arguments to write here</tt>
-Describe write here
-
-

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vaulty
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jan Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: vault
+  name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: hashdiff
+  name: vault
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.17.0
 description: Vault CLI that is based on the Vault Ruby gem
 email:
 - jan@playpass.be
@@ -102,6 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: A description of your project