kubs_cli 0.1.14 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee14148c1c17c074ef8eb487c65fccd67e41d9c6b4e08b63ffdb3c1336473fb1
-  data.tar.gz: 976ee163359c2426891873b4d565de2522cf29c67003eb0a622797e3fb9b6c5d
+  metadata.gz: c30d591c9deddfad16a1ea6cecd7bf4294905534af52c72b05242989b30ddb62
+  data.tar.gz: 75eeec8cd86664fa180ffa97dcec773b288e4d872fbdb884c9a7891391468070
 SHA512:
-  metadata.gz: d47093bf67776de700879e0b3cdfae810c9ebfbef948ac26f115e7935245f92048bce42d85618555e0bfb641fc5e6df1248f71123d509587593ec226e8aa67ed
-  data.tar.gz: 5d679a0b07f57b2def31631646ff1568f6fe56b532792f1abc6f13c3d8207d19d946ae242e06b170ab306419bc1db409495c604dbca0b51432eedc4084602c80
+  metadata.gz: d3d67b9d54eb52d0cb49aeea855a604c669843d4482913ecc129ab866927d7c3262a353e661204c0a87daad486ad3cb62ebc4335d148c728f5e98230ec35e715
+  data.tar.gz: e65617ef648432b4b55b617473148115e889c3417b32b2609cc0c8327b3992e58719f6c0019a94cf67a83114e51a39f9b171f2f1089114253e970a41312dad14

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.14)
-      rake (~> 10.0)
+    kubs_cli (0.2.1)
+      rake (~> 13.0)
       thor (~> 0.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    ffi (1.11.1)
-    formatador (0.2.5)
-    guard (2.15.0)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -26,40 +26,40 @@ 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.7.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)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
+    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.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       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.11.0)
+    rspec-support (3.11.0)
     shellany (0.0.1)
     thor (0.20.3)
-    yard (0.9.20)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -74,4 +74,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.0.2
+   2.2.22

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/kubs_cli.gemspec

@@ -35,6 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'yard', '~> 0.9'
-  spec.add_runtime_dependency 'rake', '~> 10.0'
+  spec.add_runtime_dependency 'rake', '~> 13.0'
   spec.add_runtime_dependency 'thor', '~> 0.20'
 end

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,9 +32,15 @@ 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'
@@ -67,7 +73,7 @@ module KubsCLI
     no_commands do
       def swap_dir
         KubsCLI.load_configuration
-        Rake.cd(KubsCLI.configuration.config_files)
+        FileUtils.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

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/install.rb

@@ -5,15 +5,24 @@ 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']
 
@@ -23,13 +32,14 @@ module KubsCLI
         "#{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

@@ -61,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.14'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubs_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.1
 platform: ruby
 authors:
 - paramagicdev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Konnor's Ubuntu Based Setup & CLI