vps_cli 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c79f00707b5c1498935dbcd4c2d6cf9574a819a95431e0be14a315ea176efdd
-  data.tar.gz: 3a40b7df15968833f90308a1f9bb6955854350fd2bc39982af7d41b9198c2536
+  metadata.gz: 7c6696db497416341ea5cebc2f8b1bb1df569159bdd0c219917a6ac85650ca00
+  data.tar.gz: 69becc9a5ef9088e570f3b79ee8673e9be3d01d55d903b43af482977c026711e
 SHA512:
-  metadata.gz: d4230105862398502026744aa13fc7cd2c0fe0bfad6150d648ee1cb23fc5e450eac48272eae71c1821db1d162f5a6b23723d45c994d6ca193049019cab6be580
-  data.tar.gz: f2c38c5a5d2f521c07b3d8cd612d95eef34ccadd2c43d8c10899a1143ae54a0de1b0c1ab26ab650a462c2b26700cfba64c97744fa5bb5b147c1638bf2688df1f
+  metadata.gz: 33569fbf2c50ba92a66f8bb3b97b4106f171e25cffa5845ca8186299209823511c4ace1ad2e9bc293739ca61f5207bc1f77e014343bc7c9d93219ee38ae47385
+  data.tar.gz: f4fe8f63b6cee8b0bb5bfa23f791f31a802f58a72d3dd849f9a4a6c124edcf988c305f1be5010bfd01d8bd4858daaa6112f0fb400777140a17b326e00a2f9889

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) (Or at least attempts to)
+
+## [Unreleased]
+
+## [1.9.0] - 05-26-2019
+
+### Added
+- This changelog
+- Language server support
+- additional commands
+  * update_all, login, and version
+- additional documentation
+
+### Changed
+- Changed the way ssh keys are handled
+- Changed some minor syntax
+- Updated the README to include SOPS / GPG prereqs

data/README.md

@@ -6,6 +6,10 @@ This gem is currently unfinished and purely for my own personal use.
 This project of pulling and pushing dotfiles as well as performing installations
 etc has taken many iterations and this is its 3rd iteration
 
+## Prerequisites
+
+In order for the test suite to pass, you must have SOPS & GPG installed.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/vps_cli/access.rb

@@ -23,13 +23,13 @@ module VpsCli
     def self.provide_credentials(config = VpsCli.configuration)
       if File.exist?(config.credentials)
         file_login(yaml_file: config.credentials, netrc_file: config.netrc)
+        post_github_ssh_key(config)
       else
         command_line_login
       end
 
       # originally accepts an opts arguemnt
       generate_ssh_key
-      post_github_ssh_key(config)
     end
 
     # Provides all login credentials via a SOPS encrypted yaml file
@@ -144,15 +144,15 @@ module VpsCli
     # @option opts [File] :yaml_file (nil) the file to decrypt values with.
     #
     def self.post_github_ssh_key(config = VpsCli.configuration)
+      return puts no_credentials_found unless File.exist?(config.credentials)
       uri = URI('https://api.github.com/user/keys')
 
-      api_token = proc do |yaml, path|
-        decrypt(yaml_file: yaml, path: path)
-      end
+      api_token = proc { |yaml, path| decrypt(yaml_file: yaml, path: path) }
 
+      # only create the token if the credentials file exists
       api_path = dig_for_path(:github, :api_token)
-
       token = api_token.call(config.credentials, api_path)
+
       ssh_file = File.join(Dir.home, '.ssh', 'id_rsa.pub')
       title = get_title
 
@@ -172,5 +172,10 @@ module VpsCli
       puts 'please enter a title for your ssh key'
       $stdin.gets.chomp
     end
+
+    def self.no_credentials_found
+      puts "No credentials file found. Please check that your .vps_cli contains
+      a valid .credentials file path"
+    end
   end
 end

data/lib/vps_cli/cli.rb

@@ -25,7 +25,7 @@ module VpsCli
 
       Access.provide_credentials
 
-      VpsCli.errors.each { |error| puts error.message }
+      print_errors
     end
 
     desc 'init [-c (File)]', 'Creates a default vps_cli configuration file in the home directory'
@@ -53,22 +53,26 @@ module VpsCli
       Pull.all
     end
 
-    desc 'install [OPTIONS]', 'installs based on the flag provided'
-    def install
-      msg = puts 'Only VpsCli::Install#all_install has been implemented'
-      return msg unless options[:all]
+    desc 'update_all', 'updates all packages'
+    def update_all
+      VpsCli.load_configuration(options[:config])
+      Install.prep
+      Install.install_non_apt_packages
+    end
 
+    desc 'install_all', 'installs all packages'
+    def install_all
       Install.all_install
 
       return if VpsCli.errors.empty?
 
-      VpsCli.errors.each do |error|
-        if error.responds_to?(:message)
-          puts error.message
-        else
-          puts error
-        end
-      end
+      print_errors
+    end
+
+    desc 'login', 'pushes keys from your ~/.credentials.yaml file'
+    def login
+      VpsCli.load_configuration(options[:config])
+      VpsCli.provide_credentials
     end
 
     desc 'git_pull', 'Automatically pulls in changes in your config_files repo'

data/lib/vps_cli/helpers/github_http.rb

@@ -93,9 +93,15 @@ module VpsCli
     def ssh_key_exist?(json_string:)
       # just in case your ssh key has a comment in it
       # keys pulled from github will not have comments
-      ssh_key = @ssh_key.split('==')[0].concat('==')
+      ssh_key = if @ssh_key.include?('==')
+                  @ssh_key.split('==')[0].concat('==')
+                else
+                  @ssh_key
+                end
 
       JSON.parse(json_string).any? do |data|
+        p data
+        p ssh_key
         data['key'] == ssh_key
       end
     end

data/lib/vps_cli/install.rb

@@ -24,6 +24,13 @@ module VpsCli
     # Runs through multiple methods listed below
     # @see #prep
     # @see #packages
+    def self.all_install
+      prep
+      packages
+      install_non_apt_packages
+    end
+
+    # runs #all_install without the sudo apt-get packages
     # @see #other_tools
     # @see #neovim_support
     # @see #omz_full_install
@@ -32,9 +39,7 @@ module VpsCli
     # @see #plug_install_vim_neovim
     # @see #install_gems
     # @see add_language_servers
-    def self.all_install
-      prep
-      packages
+    def self.install_non_apt_packages
       other_tools
       neovim_support
       omz_full_install
@@ -152,14 +157,6 @@ module VpsCli
         Rake.mkdir_p(install_path)
         Rake.sh("git clone https://github.com/tmux-plugins/tpm #{install_path}")
       end
-      # start a server but don't attach to it
-      Rake.sh('tmux start-server')
-      # create a new session but don't attach to it either
-      Rake.sh('tmux new-session -d')
-      # install the plugins
-      Rake.sh('~/.tmux/plugins/tpm/scripts/install_plugins.sh')
-      # killing the server is not required, I guess
-      Rake.sh('tmux kill-server')
     end
 
     # Installs all gems located in Packages::GEMS

data/lib/vps_cli/version.rb

@@ -1,3 +1,3 @@
 module VpsCli
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/vps_cli.rb

@@ -52,36 +52,18 @@ module VpsCli
     #   The local dir is where files are copied to
     attr_writer :configuration
 
-    # Base set of options, will set the defaults for the various options
-    # Take a hash due to people being able to set their own directories
-    # @param [Hash] Takes the hash to modify
-    # @return [Hash] Returns the options hash with the various options
-    # Possible options:
-    #   :backup_dir
-    #   :local_dir
-    #   :dotfiles_dir
-    #   :misc_files_dir
-    #   :local_sshd_config
-    #   :verbose
-    #   :testing
-    # def create_options(opts = {})
-    #   opts[:backup_dir] ||= BACKUP_FILES_DIR
-    #   opts[:local_dir] ||= Dir.home
-    #   opts[:dotfiles_dir] ||= DOTFILES_DIR
-    #   opts[:misc_files_dir] ||= MISC_FILES_DIR
-    #   opts[:local_sshd_config] ||= '/etc/ssh/sshd_config'
-
-    #   opts[:verbose] = false if opts[:verbose].nil?
-    #   opts[:interactive] = true if opts[:interactive].nil?
-
-    #   opts
-    # end
-
-    def full_install(options = {})
+    def full_install
       VpsCli::Setup.full
       VpsCli::Install.full
-      VpsCli::Access.provide_credentials(options)
-      VpsCli::Copy.all(options)
+      VpsCli::Access.provide_credentials
+      VpsCli::Copy.all
+    end
+
+    def print_errors
+      VpsCli.errors.each do |error|
+        puts error.message if error.responds_to?(:message)
+        puts error unless error.responds_to?(:message)
+      end
     end
   end
 

data/vps_cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
     spec.metadata['homepage_uri'] = 'https://github.com/ParamagicDev/vps_cli'
     spec.metadata['source_code_uri'] = 'https://github.com/ParamagicDev/vps_cli'
-    spec.metadata['changelog_uri'] = 'https://github.com/ParamagicDev/vps_cli'
+    spec.metadata['changelog_uri'] = 'https://github.com/ParamagicDev/vps_cli/CHANGELOG.md'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
       'public gem pushes.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vps_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - paramagicdev
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -152,7 +153,7 @@ metadata:
   allowed_push_host: https://rubygems.org/
   homepage_uri: https://github.com/ParamagicDev/vps_cli
   source_code_uri: https://github.com/ParamagicDev/vps_cli
-  changelog_uri: https://github.com/ParamagicDev/vps_cli
+  changelog_uri: https://github.com/ParamagicDev/vps_cli/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: