kubs_cli 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75a8510453b3db31d2458fbb3e4b8a2bbde2fa5e28639739eb433a957bf00c9d
-  data.tar.gz: b433d69b8809545b60195238e1208821beb8f69185213af8821db200531fbf35
+  metadata.gz: a822e2006d5f00043cbb2e79c8d3a5a0ae6a761a1a50b8c3470752707a5b9f52
+  data.tar.gz: 0d202f3d9848165a0b179e8bcaf697f33867f23a8710ffa327671941cf31504d
 SHA512:
-  metadata.gz: 20e218b26eddba27039f2140b42b15179da1c17ce795c0bf595fcd26c72b03cec850cfbf623722bf6caa81e13497b589c05e0d740215bd838939afa4e0448a60
-  data.tar.gz: 7116c7738026beb1e93f1f32e7109f8e133987825bf484df652f27ec51ccfb32d1c27ad3d82bf73ed311813b6db5f3dcaaed3cf037f503b68c369680b74d1f64
+  metadata.gz: d012d72dfb5ae6cf13c210d9cd3115301600e0755678bb9c8138e18616e4a99ac93a14acbbcd0274bb0f6049d9c23c3e6f609a99fb84e0564fdf08f2f2b562b0
+  data.tar.gz: a9e2726818f6ac21446968364c1c6f73e977e523468a134c37c11bce7ba2cd1bfa17cee5575386b54a09bf7c24e5b5bc27a3545b15b6716f45ce97cd0cdeeb1a

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 tags
+.git
 
 # rspec failure tracking
 .rspec_status

data/Dockerfile

@@ -1,24 +1,25 @@
 FROM ruby:2.6.3
 
+
 RUN apt update && apt upgrade -y
 
 # libffi needed for libffi gem
 RUN apt install -y libffi-dev apt-utils git
 
-RUN git clone https://github.com/ParamagicDev/config-files.git $HOME/config-files
+
 
 # copy the directory
-RUN mkdir $HOME/myapp
-WORKDIR $HOME/myapp
-COPY . $HOME/myapp
+RUN mkdir /myapp
+WORKDIR /myapp
+COPY . /myapp
 RUN gem install bundler
 RUN bundle install
 
 RUN rake build && gem install pkg/*
 
-
 # Create a user, and give them sudo privileges if needed
 # password is 'docker'
-# RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
-# USER docker
+RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+USER docker
+RUN git clone https://github.com/ParamagicDev/config-files.git /home/docker/config-files
 

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    kubs_cli (0.1.9)
+    kubs_cli (0.2.0)
       rake (~> 10.0)
       thor (~> 0.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    ffi (1.11.1)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    ffi (1.13.1)
     formatador (0.2.5)
-    guard (2.15.0)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -26,40 +26,38 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
+    listen (3.3.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
     method_source (0.9.2)
     nenv (0.3.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rake (10.5.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    ruby_dep (1.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
     shellany (0.0.1)
     thor (0.20.3)
-    yard (0.9.20)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -74,4 +72,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -30,7 +30,9 @@ Or install it yourself as:
 gem install kubs_cli
 kubs -v # version
 kubs init # Creates a $HOME/.kubs directory
-kubs install # Installs items as defined by $HOME/.kubs/dependencies.yaml
+kubs install_dependencies # Installs items as defined by $HOME/.kubs/dependencies.yaml
+source ~/.zshrc # or ~/.bashrc, whatever youre using
+kubs install_packages
 kubs copy # Copies from $HOME/config-files/(dotfiles|gnome-terminal-settings) to $HOME
 kubs pull # Copes from $HOME/.(dotfiles) to $HOME/config-files(dotfiles|gnome-terminal-settings)
 kubs git_pull
@@ -41,7 +43,9 @@ kubs git_push
 
 The `$HOME/.kubs` is a good directory to check out
 
-The `$HOME/.kubs/dependencies.yaml` is structed to be extended without updating my gem
+The `$HOME/.kubs/dependencies.yaml` and `$HOME/.kubs/packages.yaml` are
+constructed to be extended without having to update the gem everytime
+I want to add something new
 
 ### Messing with docker
 

data/lib/examples/config.rb

@@ -4,6 +4,7 @@ KubsCLI.configure do |config|
   # Where you want the dotfiles to be saved
   config.local_dir = Dir.home
   config.dependencies = File.join(Dir.home, '.kubs', 'dependencies.yaml')
+  config.packages = File.join(Dir.home, '.kubs', 'packages.yaml')
 
   # Where you have your dotfiles / misc_files saved
   config.config_files = File.join(Dir.home, 'config-files')

data/lib/examples/dependencies.yaml

@@ -20,29 +20,3 @@ apt:
       postgresql pry rubygems fail2ban
       neovim asciinema docker mosh yarn
       silversearcher-ag virtualbox
-
-gems:
-  command: gem install
-  packages: colorls neovim rake pry rubocop gem-ctags rails yard
-            thor bundler solargraph
-
-npm_packages:
-  command: npm install -g
-  packages: neovim eslint
-            bash-language-server --unsafe-perm
-            vscode-html-languageserver-bin
-            vscode-css-languageserver-bin
-            javascript-typescript-langserv
-            dockerfile-language-server-nodejs
-
-pip2_packages:
-  command: pip2 install --user --upgrade
-  packages: pynvim neovim
-
-pip3_packages:
-  command: pip3 install --user --upgrade
-  packages: pynvim neovim
-
-snap_packages:
-  command: sudo snap install
-  packages: heroku

data/lib/examples/packages.yaml

@@ -0,0 +1,25 @@
+gems:
+  command: gem install
+  packages: colorls neovim rake pry rubocop gem-ctags rails yard
+    thor bundler solargraph
+
+npm_packages:
+  command: npm install -g
+  packages: neovim eslint
+    bash-language-server --unsafe-perm
+    vscode-html-languageserver-bin
+    vscode-css-languageserver-bin
+    javascript-typescript-langserv
+    dockerfile-language-server-nodejs
+
+pip2_packages:
+  command: pip2 install --user --upgrade
+  packages: pynvim neovim
+
+pip3_packages:
+  command: pip3 install --user --upgrade
+  packages: pynvim neovim
+
+snap_packages:
+  command: sudo snap install
+  packages: heroku

data/lib/kubs_cli/cli.rb

@@ -32,14 +32,20 @@ module KubsCLI
       run_command { KubsCLI::Pull.new.pull_all }
     end
 
-    desc 'install', 'installs from .kubs/dependencies.yaml'
-    def install
-      run_command { KubsCLI::Install.new.install_all }
+    desc 'install_dependencies', 'installs from .kubs/dependencies.yaml'
+    def install_dependencies
+      run_command { KubsCLI::Install.new.install_dependencies }
+      Rake.sh('echo "Restart your shell"')
+    end
+
+    desc 'install_packages', 'installs from .kubs/packages.yaml'
+    def install_packages
+      run_command { KubsCLI::Install.new.install_packages }
     end
 
     # desc 'git push [-r CONFIG_FILES_REPO]', 'pushes your config_files upstream'
     desc 'git_push', 'pushes your config_files upstream'
-    def git_push
+    def git_push(message = nil)
       message ||= 'auto push files'
 
       swap_dir do
@@ -66,7 +72,7 @@ module KubsCLI
 
     no_commands do
       def swap_dir
-        KubsCLI.load_configuration(options[:config])
+        KubsCLI.load_configuration
         Rake.cd(KubsCLI.configuration.config_files)
         yield
       end

data/lib/kubs_cli/configuration.rb

@@ -8,6 +8,7 @@ module KubsCLI
 
     # Dependencies to install
     attr_accessor :dependencies
+    attr_accessor :packages
 
     # remote files to be used
     attr_accessor :config_files, :dotfiles, :gnome_terminal_settings
@@ -20,6 +21,7 @@ module KubsCLI
       # set to nil so that someone must set a path
       @config_files = nil
       @dotfiles = nil
+      @packages = nil
       @gnome_terminal_settings = nil
       @dependencies = nil
     end
@@ -53,6 +55,9 @@ module KubsCLI
 
     puts "Creating a default configuration files @ #{path}"
     fh.mkdirs(path)
-    fh.copy(from: EXAMPLES, to: path)
+
+    Dir["#{EXAMPLES}/*"].each do |file|
+      fh.copy(from: file, to: path)
+    end
   end
 end

data/lib/kubs_cli/copy.rb

@@ -27,6 +27,9 @@ module KubsCLI
     end
 
     def copy_gnome_terminal_settings
+      unless @config.gnome_terminal_settings
+        return
+      end
       # This is the ONLY spot for gnome terminal
       gnome_path = '/org/gnome/terminal/'
       gnome_file = @config.gnome_terminal_settings

data/lib/kubs_cli/file_helper.rb

@@ -17,8 +17,13 @@ module KubsCLI
       Rake.mkdir_p(to_dir) unless Dir.exist?(to_dir)
       return Rake.cp(from, to) unless File.directory?(from)
 
-      Rake.mkdir_p(to) unless Dir.exist?(to)
-      Rake.cp_r(from, to)
+      Rake.mkdir_p(to)
+
+      Dir["#{from}/*"].each do |dir|
+        Rake.cp_r(dir, to) # next if File.directory?(dir)
+
+        # Rake.cp(dir, to)
+      end
     end
 
     # Creates dirs using Rake.mkdir_p if it does not exist

data/lib/kubs_cli/install.rb

@@ -5,31 +5,41 @@ module KubsCLI
   class Install
     def initialize(config = KubsCLI.configuration)
       @fh = FileHelper.new
-      @yaml_file = config.dependencies
+      @dependencies = config.dependencies
+      @packages = config.packages
+    end
+
+    def install_dependencies
+      install_from_file(@dependencies)
+    end
+
+    def install_packages
+      install_from_file(@packages)
     end
 
     # Installs dependencies from a given YAML file
     # @see lib/examples/dependencies.yaml
     # @return Array<String> Returns an array of strings to run via Rake to install
     #   various packages
-    def create_dependencies_ary
-      hash = @fh.load_yaml(@yaml_file)
+    def create_ary_from_yaml(file)
+      hash = @fh.load_yaml(file)
       hash.map do |_key, value|
         command = value['command']
 
         packages = value['packages']
-        packages = packages.join("\n") if packages.is_a?(Array)
+        packages = packages.join(' ') if packages.is_a?(Array)
 
         "#{command} #{packages}"
       end
     rescue StandardError => e
-      KubsCLI.add_error(e: e, msg: "There was an issue with creating a dependencies array from #{@yaml_file}")
+      msg = "There was an issue with creating a dependencies array from #{file}"
+      KubsCLI.add_error(e: e, msg: msg)
     end
 
     # Installs dependencies from a give yaml_file via Rake.sh
     # @return void
-    def install_all
-      ary = create_dependencies_ary
+    def install_from_file(file)
+      ary = create_ary_from_yaml(file)
 
       ary.each do |command|
         Rake.sh(command.to_s)

data/lib/kubs_cli/pull.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'rake'
 
 module KubsCLI
   # Used to pull items into your config-files repo
@@ -28,18 +29,20 @@ module KubsCLI
     end
 
     def copy_files(orig_file, new_file)
-      return @fh.copy(from: orig_file, to: new_file) unless File.directory?(new_file)
-      return @fh.copy(from: orig_file, to: new_file) unless File.directory?(orig_file)
+      if File.directory?(new_file) || File.directory?(new_file)
+        Dir.each_child(orig_file) do |o_file|
+          Dir.each_child(new_file) do |n_file|
+            next unless o_file == n_file
 
-      Dir.each_child(orig_file) do |o_file|
-        Dir.each_child(new_file) do |n_file|
-          next unless o_file == n_file
+            o_file = File.join(File.expand_path(orig_file), o_file)
+            n_file = File.expand_path(new_file)
 
-          o_file = File.join(File.expand_path(orig_file), o_file)
-          n_file = File.expand_path(new_file)
+            Rake.cp_r(o_file, n_file)
+          end
 
-          @fh.copy(from: o_file, to: n_file)
         end
+      else
+        Rake.cp(orig_file, new_file)
       end
     end
 
@@ -58,6 +61,9 @@ module KubsCLI
 
     # Pulls gnome_terminal_settings into your dotfiles inside your repo
     def pull_gnome_terminal_settings
+      unless @config.gnome_terminal_settings
+        return
+      end
       # This is where dconf stores gnome terminal
       gnome_dconf = '/org/gnome/terminal/'
 

data/lib/kubs_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KubsCLI
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubs_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - paramagicdev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-24 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
-description: 
+description:
 email:
 - konnor5456@gmail.com
 executables:
@@ -146,6 +146,7 @@ files:
 - kubs_cli.gemspec
 - lib/examples/config.rb
 - lib/examples/dependencies.yaml
+- lib/examples/packages.yaml
 - lib/kubs_cli.rb
 - lib/kubs_cli/cli.rb
 - lib/kubs_cli/configuration.rb
@@ -162,7 +163,7 @@ metadata:
   homepage_uri: https://github.com/ParamagicDev/kubs_cli
   source_code_uri: https://github.com/ParamagicDev/kubs_cli
   changelog_uri: https://github.com/ParamagicDev/kubs_cli/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,8 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Konnor's Ubuntu Based Setup & CLI
 test_files: []