rise-cli 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19e77425e03eb395280293bd2bc937fd61097425
-  data.tar.gz: b46a75c6fcf17c3e2c1ba6d4edb82c956e2d5e94
+  metadata.gz: d5162dbadabf1ce5e3c6cae30d4b499299f3af19
+  data.tar.gz: 9ad01e3cea0111f1a63997e3a4f89dea21076915
 SHA512:
-  metadata.gz: 95af0749ea3c6d1177ade8f38e58490ef58466a044dfddc919691ba085e9d68c9c315eb3a36045b0af2b1698e6ef8de9a0c5c2e430a735f1223161f7c81c7b76
-  data.tar.gz: 755c0afff754ca0932721b0b66963af59a346e14d03992e994f47fad7826d3e1cb3335d681e2d95da9bce21b5c024d54d291d6b646dcd54f08bac1af3ac16a67
+  metadata.gz: 38948ebe69253939884b25738398480f3782ea87976401039d5d04e169418a64f49b3f686c9aa89f38ef0dcfe3c58136bd4790c78161ef14102277b65cd9f246
+  data.tar.gz: 96e5996ca8e4e98505e39f753cdced60255bca2d983e546c3d8266ab5999082f8bebd2ee583699c5e7370dcc46b8d3094cbc4ff3442c519372a02028b25ce5ba

data/.rspec_status

@@ -0,0 +1,7 @@
+example_id                   | status | run_time        |
+---------------------------- | ------ | --------------- |
+./spec/rise/cli_spec.rb[1:1] | passed | 0.00077 seconds |
+./spec/rise/cli_spec.rb[1:2] | passed | 0.00046 seconds |
+./spec/rise/cli_spec.rb[1:3] | passed | 0.00011 seconds |
+./spec/rise/cli_spec.rb[1:4] | passed | 0.00011 seconds |
+./spec/rise/cli_spec.rb[1:5] | passed | 0.08637 seconds |

data/Gemfile

@@ -11,4 +11,5 @@ gem 'rex-text'
 gem 'rspec'
 gem 'rspec-core'
 gem 'rubocop'
+gem 'subcommand'
 gem 'whirly'

data/Gemfile.lock

@@ -50,6 +50,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
+    subcommand (1.0.6)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
@@ -72,6 +73,7 @@ DEPENDENCIES
   rspec
   rspec-core
   rubocop
+  subcommand
   whirly
 
 BUNDLED WITH

data/bin/rise

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.join('..', 'lib'))) unless $LOAD_PATH.include?(File.expand_path(File.join('..', 'lib')))
-# TODO
-# => Try to fix spinner bug on Windows (may be a weird interaction with \r)
 require 'core'
 
 options = {}
 options[:open] = false
 options[:ignore_files] = nil
+# TODO: convert the tasks to use thor or Rex::Parser::Arguments from 'rex'
 OptionParser.new do |opts|
   opts.banner = "Usage: #{$PROGRAM_NAME} [options]\nRise version: #{Rise::Constants::VERSION}"
   opts.separator Paint["\nGeneral Options: ", '#95a5a6']
@@ -21,7 +20,7 @@ OptionParser.new do |opts|
   end
 
   opts.on('--verbose', 'Run verbosely') do |v|
-    options[:verbose] = v
+    ENV['RISE_VERBOSE'] = 'yes'
   end
 
   opts.on('-i', '--ignore FILES', Array, 'Ignore the given files in the upload. These will be ignored if there is a .riseignore file.') do |a|
@@ -42,6 +41,14 @@ OptionParser.new do |opts|
     puts opts
     exit
   end
+
+  opts.separator Paint["\nTasks: ", '#95a5a6']
+  opts.on('--init', 'Reinitialize your password hash. (You will lose you old hash FOREVER)') do
+    Rise::Util.setup(false)
+    puts "\nPlease run the `rise` command again to upload your files using your new password."
+    exit 0
+  end
+
 end.parse!(ARGV)
 
 

data/lib/core/constants.rb

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

data/lib/core/transport.rb

@@ -17,15 +17,14 @@ module Rise
       def initialize(folder_path, excluded_files = [], include_folder = true)
         excluded_files.map! do |a|
           File.join(File.absolute_path(folder_path), a)
-        end unless excluded_files == []
+        end unless excluded_files.nil?
         @folder_path      = folder_path
         @files            = Dir.glob("#{File.absolute_path(folder_path)}/**/*")
-        @files           -= excluded_files
+        @files           -= excluded_files unless excluded_files.nil?
         @total_files      = @files.length
         @total_files_size = calculate_files_size
         @include_folder   = include_folder
         @uuid             = "#{File.basename(File.absolute_path(folder_path)).gsub('_', '-')}-#{Rex::Text.rand_text_alphanumeric(8)}" # Structure: foldername-8RNDLTRS
-        puts @files
       end
 
       #

data/lib/core/util.rb

@@ -72,27 +72,31 @@ module Rise
     #
     # Creates all of the necessary files and login information
     #
-    def self.setup
-      puts Paint['Detected first time setup, creating necessary files...', :blue]
-      FileUtils.mkdir(RISE_DATA_DIR)
-      FileUtils.mkdir(File.join(RISE_DATA_DIR, 'auth'))
+    def self.setup(first = true)
+      if first
+        puts Paint['Detected first time setup, creating necessary files...', :blue]
+        FileUtils.mkdir(RISE_DATA_DIR)
+        FileUtils.mkdir(File.join(RISE_DATA_DIR, 'auth'))
+      end
 
       puts Paint['Create a password to secure your uploads.', :bold]
-      pw = signup
-      while pw.length < 9
+      pw = Rise::Util.signup
+      while true
+        break if pw.length > 8
         puts Paint['Password not long enough,
           it has to be longer than 8 characters', :red]
-          pw = signup
+          pw = Rise::Util.signup
       end
-      File.open(File.join(RISE_DATA_DIR, 'auth', 'creds.json')) do |f|
-        creds_hash = { 'hash' => BCrypt::Password.new(pw) }
+      File.open(File.join(RISE_DATA_DIR, 'auth', 'creds.json'), 'w') do |f|
+        vputs('Writing hash to creds.json...')
+        creds_hash = { 'hash' => BCrypt::Password.create(pw) }
         f.puts(JSON.pretty_generate(creds_hash))
       end
     end
 
-    def signup
+    def self.signup
       print 'Password: '
-      STDIN.noecho(&:gets)
+      STDIN.noecho(&:gets).chomp
     end
 
     #

data/lib/core.rb

@@ -1,9 +1,10 @@
 # Gems
 require 'clipboard'
 require 'rex/text'
-require 'optparse'
+require 'subcommand'
 
 # lib files
 require 'core/transport'
 require 'core/util'
 require 'core/constants'
+require 'core/text'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rise-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Carter Brainerd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-29 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec_status"
 - ".rubocop.yml"
 - ".travis.yml"
 - CONTRIBUTING.md