rise-cli 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5162dbadabf1ce5e3c6cae30d4b499299f3af19
-  data.tar.gz: 9ad01e3cea0111f1a63997e3a4f89dea21076915
+  metadata.gz: 18cc23e94cacadc5a5ad1ab7eb0faab43adbb646
+  data.tar.gz: 5c12e3d417413766fdafd92bd802ebdcaa8b9334
 SHA512:
-  metadata.gz: 38948ebe69253939884b25738398480f3782ea87976401039d5d04e169418a64f49b3f686c9aa89f38ef0dcfe3c58136bd4790c78161ef14102277b65cd9f246
-  data.tar.gz: 96e5996ca8e4e98505e39f753cdced60255bca2d983e546c3d8266ab5999082f8bebd2ee583699c5e7370dcc46b8d3094cbc4ff3442c519372a02028b25ce5ba
+  metadata.gz: fa22c89d20b82f85988da5e9af41c0734f882fc950fe2b5443248cc8915edcde881613ece2d9845068be712a76bd68fa9962b65d34d33d0e1b6ca8eb4d6b2d5f
+  data.tar.gz: 03e0c1a1aad929627a4b7b946ee8dae6b3f31947a34af97e3d662d91d98a3721cdab42caa856ed0fc1ba0c7070e4043d9d1aa9e6dd146811f5efe83b572abf19

data/bin/rise

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.join('..', 'lib'))) unless $LOAD_PATH.include?(File.expand_path(File.join('..', 'lib')))
+
 require 'core'
 
 options = {}
@@ -10,7 +11,7 @@ OptionParser.new do |opts|
   opts.banner = "Usage: #{$PROGRAM_NAME} [options]\nRise version: #{Rise::Constants::VERSION}"
   opts.separator Paint["\nGeneral Options: ", '#95a5a6']
 
-  opts.on('-d DIR', '--dir DIR', String, 'Upload files in DIR') do |d|
+  opts.on('-d DIR', '--dir DIR', String, 'Upload files in DIR (Defaults to the current directory)') do |d|
     options[:directory] = d unless d.nil?
   end
 
@@ -39,22 +40,31 @@ OptionParser.new do |opts|
 
   opts.on('-h', '--help', 'Show this help message') do
     puts opts
+    puts Rise::Text::TASKS_HELP
     exit
   end
 
   opts.separator Paint["\nTasks: ", '#95a5a6']
-  opts.on('--init', 'Reinitialize your password hash. (You will lose you old hash FOREVER)') do
+
+end.parse!(ARGV)
+
+# Ladies and gentlemen, this is what
+# happens when optparse doesn't have
+# good subcommand/task syntax support
+while opt = ARGV.shift do
+  case opt
+  when 'init'
     Rise::Util.setup(false)
-    puts "\nPlease run the `rise` command again to upload your files using your new password."
+    exit 0
+  when 'update'
+    Rise::Util.check_for_update!
     exit 0
   end
-
-end.parse!(ARGV)
+end
 
 
 if Rise::Util.first_run?
   Rise::Util.setup
-  puts "\nPlease run the `rise` command again to upload your files."
   exit 0
 end
 Rise::Util.check_for_update!

data/lib/core/constants.rb

@@ -8,7 +8,7 @@ module Rise
   # Holds constants used throughout the framework
   #
   module Constants
-    VERSION  = '0.2.4'.freeze
+    VERSION  = '0.2.5'.freeze
     EMAIL    = '0xCB@protonmail.com'.freeze
     AUTHORS  = ['Carter Brainerd']
     NAME     = 'rise-cli'.freeze

data/lib/core/text.rb

@@ -0,0 +1,24 @@
+require 'paint'
+#
+# Text and printing utility methods
+#
+module Rise
+  module Text
+
+    TASKS_HELP =
+    %Q{    init                             Reinitialize your password hash. (You will lose you old hash FOREVER)
+    update                           Updates the current rise-cli installation (aliased by -u)
+
+Examples:
+    #{Paint['$ rise init -v', '#2ecc71']}                    Reinitializes your password with verbose output
+    #{Paint['$ rise -d ../my-project -o', '#2ecc71']}        Will upload all files in `../my-project` and open it in a browser
+    }
+
+    #
+    # Prints +msg+ if the +RISE_VERBOSE+ environment variable is true (set with --verbose)
+    #
+    def self.vputs(msg='')
+      puts msg if ENV['RISE_VERBOSE'] == 'yes'
+    end
+  end
+end

data/lib/core/util.rb

@@ -50,18 +50,15 @@ module Rise
               spinner: 'line',
               status: "New version available (#{Paint[Rise::Constants::VERSION, 'red']} -> #{Paint[current_version, '#3498db']}), updating..."
             ) do
-              system("gem uninstall rise-cli -v #{Rise::Constants::VERSION} > /dev/null")
-              system("gem install rise-cli > /dev/null")
+              system("gem install rise-cli")
               puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
             end
           end
         elsif src == 1
-          if `git log HEAD..origin/master --oneline` != ''
-            puts "It seems you're on bleeding edge, fetching new changes..."
-            vputs("Updating from #{`git show --no-color --oneline -s`.split(' ')[0]} to #{`git rev-parse --short HEAD`}")
-            `git pull`
-            puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
-          end
+          puts "It seems you're on bleeding edge, fetching new changes..."
+          Rise::Text.vputs("Updating from #{`git show --no-color --oneline -s`.split(' ')[0]} to #{`git rev-parse --short HEAD`}")
+          `git pull`
+          puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
         end
       rescue StandardError => e
         puts "Unable to check for updates. Error: #{Paint[e.message, 'red']}"
@@ -88,10 +85,11 @@ module Rise
           pw = Rise::Util.signup
       end
       File.open(File.join(RISE_DATA_DIR, 'auth', 'creds.json'), 'w') do |f|
-        vputs('Writing hash to creds.json...')
+        Rise::Text.vputs('Writing hash to creds.json...')
         creds_hash = { 'hash' => BCrypt::Password.create(pw) }
         f.puts(JSON.pretty_generate(creds_hash))
       end
+      puts "\nAll done!\nPlease run the `rise` command again to upload your files."
     end
 
     def self.signup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rise-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Carter Brainerd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -104,6 +104,7 @@ files:
 - img/rise_logo.png
 - lib/core.rb
 - lib/core/constants.rb
+- lib/core/text.rb
 - lib/core/transport.rb
 - lib/core/util.rb
 - rise-cli.gemspec