ninny 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 228ceb1c0c7c690a792b4b1c2cfc90fca6e23b93c42e4fa3fdfe792fa45bb800
-  data.tar.gz: ab7cff0604ed9d1740c58f96f82c1429059f9473b02ba80e5bbc00a1f6041c20
+  metadata.gz: 56c95a75100e8d999b3c8d8797623bf50b3b27595fa1da0a496ec0821fb43d38
+  data.tar.gz: 20c4f576d8d81047a3aee49a45993f2021a35b020a78c5701d45da4bf02a2f52
 SHA512:
-  metadata.gz: da97b642577462da42d373500762fbb4c0dfd5d881d1e779b7feeb33c998a81db1d5508ec3a2efadefa72a2492a5b5efea647658491b9c8148f236750d176c1d
-  data.tar.gz: 02fc25d9fc9d46dd184285d348126e010cb58c575cda24f68764c30be82636f06a0593ff18b6fcc652245cee40b3abd5725fe56a8f21207f12570a6cb5fe101b
+  metadata.gz: 5f71dfc3a85f2cfe43f576dcbf751c5b323061e098caffa16862c2afd3ae0c7b1bfb4cd036088d40723f59a7f4faeef7329df467024d16446d11f5a8b5ecd09c
+  data.tar.gz: ae54faf5617617129f155b900cdf5491442885e654f2c731cdf38d4f8ff0f0a8ed18fb3653fadb28aba2368fe2780fda86e72b0942a7c65cad99f024b9148118

data/README.md

@@ -42,9 +42,15 @@ Then, each developer on the project should set up a file at `~/.ninny.yml` on th
 
 ```bash
 $ ninny setup
-Do you have a new GitLab private token? (Y/n) y # enter 'y'
+Do you have a new GitLab private token? (Y/n) Yes # enter 'y'
 Enter private token: abc123def456ghi789jk # enter your private token
-User config updated
+User config updated!
+```
+
+Or, you can pass the private token in as part of the command:
+```bash
+$ ninny setup --token abc123def456ghi789jk # or '-t abc123def456ghi789jk' for short
+User config updated!
 ```
 
 The private token should be a personal access token for that person's GitLab account (generated [here](https://gitlab.com/-/profile/personal_access_tokens)).

data/lib/ninny/cli.rb

@@ -54,6 +54,7 @@ module Ninny
 
     desc 'setup', 'Interactively setup configuration'
     method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information'
+    method_option :token, aliases: '-t', type: :string, desc: 'The GitLab token to add to the ~/.ninny.yml file'
     def setup(*)
       if options[:help]
         invoke :help, ['setup']

data/lib/ninny/commands/setup.rb

@@ -5,29 +5,28 @@ require_relative '../command'
 module Ninny
   module Commands
     class Setup < Ninny::Command
-      attr_reader :config
+      attr_reader :config, :private_token
 
       def initialize(options)
         @options = options
+        @private_token = options[:token]
         @config = Ninny.user_config
       end
 
       def execute(output: $stdout)
         try_reading_user_config
 
-        private_token = prompt_for_gitlab_private_token
+        unless @private_token
+          @private_token = prompt_for_gitlab_private_token
 
-        begin
-          # TODO: This only works with thor gem < 1. So, we need to make this work when TTY
-          #   releases versions compatible with thor versions >= 1 as well.
-          config.write(force: true)
-        rescue StandardError
-          puts '  Unable to write config file via TTY... continuing anyway...'
-          File.open("#{ENV['HOME']}/.ninny.yml", 'w') do |file|
-            file.puts "gitlab_private_token: #{private_token}"
+          unless @private_token
+            output.puts "Please create a private token on GitLab and then rerun 'ninny setup'."
+            return
           end
         end
 
+        set_response = config_set_gitlab_private_token(@private_token)
+        write_gitlab_private_token(@private_token, set_response)
         output.puts "User config #{@result}!"
       end
 
@@ -38,6 +37,27 @@ module Ninny
         @result = 'created'
       end
 
+      def config_set_gitlab_private_token(private_token)
+        # TODO: This only works with thor gem < 1. So, we need to make this work when TTY
+        #   releases versions compatible with thor versions >= 1 as well.
+        config.set(:gitlab_private_token, value: private_token)
+        :success
+      rescue ArgumentError
+        puts '  Unable to set new token via TTY... continuing anyway...'
+        :failed
+      end
+
+      def write_gitlab_private_token(private_token, set_response)
+        raise StandardError unless set_response == :success
+
+        # TODO: This only works with thor gem < 1. So, we need to make this work when TTY
+        #   releases versions compatible with thor versions >= 1 as well.
+        config.write(force: true)
+      rescue StandardError
+        puts '  Unable to write config file via TTY... continuing anyway...'
+        File.open("#{ENV['HOME']}/.ninny.yml", 'w') { |file| file.puts "gitlab_private_token: #{private_token}" }
+      end
+
       def prompt_for_gitlab_private_token
         begin
           new_token_text = config.gitlab_private_token ? ' new' : ''
@@ -47,17 +67,7 @@ module Ninny
 
         return unless prompt.yes?("Do you have a#{new_token_text} GitLab private token?")
 
-        private_token = prompt.ask('Enter private token:', required: true)
-
-        begin
-          # TODO: This only works with thor gem < 1. So, we need to make this work when TTY
-          #   releases versions compatible with thor versions >= 1 as well.
-          config.set(:gitlab_private_token, value: private_token)
-        rescue ArgumentError
-          puts '  Unable to set new token via TTY... continuing anyway...'
-        end
-
-        private_token
+        prompt.ask('Enter private token:', required: true)
       end
     end
   end

data/lib/ninny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ninny
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninny
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Dispatch Engineers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git