rise-cli 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 491baec96860c2e6f397b080d97d6a576c354426
-  data.tar.gz: 3b8d0b79e45e7a2fc30704369b997b854c335e1e
+  metadata.gz: 779d28b4d279139445e1cfc3cabbcb777cc54da6
+  data.tar.gz: 6661708ae6aaac054aba24e89b5ff6e5eed92ce3
 SHA512:
-  metadata.gz: dd4ee49ecc4fb1c41a1fba834f7befefc47d92b7581155c8132b42f7902ae9e7a5b157cb2ebf444b6a0eafd380dde3e5baf6d12e9ff7e1838753cb6afd514c5b
-  data.tar.gz: b2ee9cf8347959b817363a26b71584d6831c198393db75fc962f9b288a7a3551bde8ea929aa4b8bc404f548696984e4d0f464ae822eaac3fada730899ed929aa
+  metadata.gz: 987b5296e8106cedada429dd17c41340cf5c7db17d3c24529be0677ee89234b6bb7a113fe4720d7f5517133f58a123530875b70712fcd084cac35437a0de4b3f
+  data.tar.gz: 93893150e0e7b1d5c144ab76d694dfc43bff214eef0bc082f64ca234a1178ae02c3e3683231f3b21e7651b578564ce22855eec0b2e43e4fe79c102caa9b34ef5

data/.rspec_status

@@ -1,7 +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 |
+./spec/rise/cli_spec.rb[1:1] | passed | 0.0012 seconds  |
+./spec/rise/cli_spec.rb[1:2] | passed | 0.00088 seconds |
+./spec/rise/cli_spec.rb[1:3] | passed | 0.00016 seconds |
+./spec/rise/cli_spec.rb[1:4] | passed | 0.00015 seconds |
+./spec/rise/cli_spec.rb[1:5] | passed | 0.08628 seconds |

data/Gemfile

@@ -2,8 +2,10 @@
 
 source 'https://rubygems.org'
 
+gem 'activesupport'
 gem 'bcrypt', platforms: :ruby
 gem 'clipboard'
+gem 'credit_card_validations'
 gem 'http'
 gem 'os'
 gem 'paint'

data/Gemfile.lock

@@ -1,11 +1,22 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     bcrypt (3.1.11)
     clipboard (1.1.1)
+    concurrent-ruby (1.0.5)
+    credit_card_validations (3.4.0)
+      activemodel (>= 3, <= 6)
+      activesupport (>= 3, <= 6)
     diff-lcs (1.3)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
@@ -18,8 +29,11 @@ GEM
       domain_name (~> 0.5)
     http-form_data (2.0.0)
     http_parser.rb (0.6.0)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.10.3)
     os (1.0.0)
-    paint (2.0.0)
+    paint (2.0.1)
     parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
@@ -27,22 +41,22 @@ GEM
     public_suffix (3.0.0)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
+    rake (12.2.1)
     rex-text (0.2.15)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.50.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    rubocop (0.51.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
@@ -50,21 +64,24 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
-    unf_ext (0.0.7.4-x64-mingw32)
     unicode-display_width (1.3.0)
-    whirly (0.2.5)
+    whirly (0.2.6)
       unicode-display_width (~> 1.1)
 
 PLATFORMS
   ruby
-  x64-mingw32
 
 DEPENDENCIES
+  activesupport
   bcrypt
   clipboard
+  credit_card_validations
   http
   os
   paint
@@ -75,4 +92,4 @@ DEPENDENCIES
   whirly
 
 BUNDLED WITH
-   1.15.4
+   1.16.0

data/TODO.txt

@@ -3,4 +3,5 @@ TODO things for rise:
   * Add a .keyfile to each upload containing a private key. This file will be used to make sure that the same uuid can't be uploaded to twice and for a future file deletion method.
   * Add said file deletion method
   * Add GZIP file uploads
-  * ADD .riseignore functionality
+  * Add free and premium accounts (to the website too)
+    - Add safe CC# storing for the local client

data/bin/rise

@@ -5,7 +5,6 @@ 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 = "\nUsage: #{File.basename($PROGRAM_NAME)} [options] [task]\nRise version: #{Rise::Constants::VERSION}"
   opts.separator Paint["\nGlobal Options: ", '#95a5a6']
@@ -14,6 +13,10 @@ OptionParser.new do |opts|
     options[:directory] = d unless d.nil?
   end
 
+  opts.on('-q', '--quiet', 'Run with very little output (only shows result URL)') do
+    options[:quiet] = true
+  end
+
   opts.on('-v', '--version', 'Show the rise version and exit') do
     puts "Rise version: #{Paint[Rise::Constants::VERSION, '#2ecc71']}"
     exit 0
@@ -32,7 +35,7 @@ OptionParser.new do |opts|
     options[:open] = true
   end
 
-  opts.on('-u', '--update', 'Check if rise has a newer version and install it') do
+  opts.on('-u', '--update', 'Check if rise has a newer version and install it (aliased by `update` task)') do
     Rise::Util.check_for_update!
     exit 0
   end
@@ -77,18 +80,26 @@ rescue Errno::ENOENT
   ignored = options[:ignored_files]
 end
 
-uploader = Rise::Transport::Uploader.new(dir, ignored)
+key = JSON.parse(File.read(File.join(RISE_DATA_DIR, 'auth', 'creds.json')))['hash']
+uploader = Rise::Transport::Uploader.new(dir, key, ignored)
 
 if uploader.total_files_size > 52428800
   puts Paint["Max file size reached (#{uploader.total_files_size} > 50MB)", '#FF0000']
   exit 0
 end
 
+if options[:quiet]
+  result_url = uploader.upload!
+  Clipboard.copy(result_url)
+  print Paint["Your url is: #{result_url} (copied to clipboard) ", :bold]
+  exit 0
+end
+
 puts Paint['Thanks for using Rise! Your local source for serverless deployment!', '#95a5a6']
 
 Whirly.start(spinner: 'dots', status: "Uploading files (#{uploader.total_files} total files)") do
   beginning_time = Time.now
-  result_url = uploader.upload!(options[:verbose]) # Do the file upload
+  result_url = uploader.upload! # Do the file upload
 
   Whirly.status = "Done!\n"
   Clipboard.copy(result_url)

data/lib/core/constants.rb

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

data/lib/core/text.rb

@@ -9,8 +9,8 @@ module Rise
     update                           Updates the current rise-cli installation (aliased by -u)
 
 #{Paint['Examples:', '#95a5a6']}
-    #{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
+    #{Paint['$ rise init --verbose', '#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
     }
 
     #

data/lib/core/transport.rb

@@ -2,6 +2,8 @@ require 'rex/text'
 require 'uri'
 require 'json'
 require 'http'
+require 'active_support'
+
 
 module Rise
   #
@@ -11,10 +13,10 @@ module Rise
     # Handles uploading files
     class Uploader
       attr_reader :folder_path, :total_files, :include_folder
-      attr_reader :uuid, :current_file, :total_files_size
+      attr_reader :uuid, :current_file, :total_files_size, :key
       attr_accessor :files
 
-      def initialize(folder_path, excluded_files = [], include_folder = true)
+      def initialize(folder_path, key, excluded_files = [], include_folder = true)
         excluded_files.map! do |a|
           File.join(File.absolute_path(folder_path), a)
         end unless excluded_files.nil?
@@ -25,13 +27,19 @@ module Rise
         @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
+        @key              = key
       end
 
+      # This makes a HTTP +PUT+ request on port 8080 to the /api/v1/ endpoint
+      # for each file in the selected folder.
+      #
+      # The body of the request is the contents of the file.
       #
-      # Uploads the files from +folder_path+ to the upload server
+      # The +Authorization+ request header is used for making the .keyfile on the serverside
+      # for the future file deletion method.
       # @return String the final URL of the uploaded contents
       #
-      def upload!(*)
+      def upload!
         upload_uri_base = "http://rise.sh:8080/api/v1/#{@uuid}"
         access_uri = "https://rise.sh/#{@uuid}"
         uri = ''
@@ -46,9 +54,9 @@ module Rise
             File.expand_path(folder_path), '')
           uri = URI.parse("#{upload_uri_base}/#{final_path.gsub(' ', '')}?dir=#{isdir}")
           begin
-            HTTP.put(uri.to_s, body: File.read(f))
+            HTTP.auth("#{key}").put(uri.to_s, body: ActiveSupport::Gzip.compress(File.read(f)))
           rescue Errno::EISDIR
-            HTTP.put(uri.to_s, body: '')
+            HTTP.auth("#{key}").put(uri.to_s, body: '')
             next
           end
         end

data/lib/core/util.rb

@@ -7,6 +7,7 @@ require 'io/console'
 require 'whirly'
 require 'os'
 require 'json'
+require 'credit_card_validations'
 require_relative 'constants'
 
 module Rise
@@ -47,7 +48,6 @@ module Rise
           current_version = JSON.parse(HTTP.get('https://rubygems.org/api/v1/versions/rise-cli/latest.json'))['version']
 
           current_version_i = current_version.gsub('.', '').to_i
-          puts "#{current_version_i} #{Rise::Constants::VERSION.gsub('.', '').to_i}"
 
           if current_version_i > Rise::Constants::VERSION.gsub('.', '').to_i
             Whirly.start(
@@ -82,7 +82,8 @@ module Rise
 
       puts Paint['Create a password to secure your uploads.', :bold]
       pw = Rise::Util.signup
-      while pw.length < 8
+      while (length = pw.length)
+        break if length > 8
         puts Paint["Password not long enough,
           it has to be longer than 8 characters\n", :red]
           pw = Rise::Util.signup
@@ -111,5 +112,26 @@ module Rise
       end
     end
 
+
+    # @param number [String] the credit card number to add
+    def self.add_cc_number(number)
+      if !number.is_a?(String)
+        raise ArgumentError, '`number` must be of type String'
+      end
+
+      if !CreditCardValidations::Detector.new(number).valid?
+        puts Paint['Credit card is not valid']
+        return
+      end
+
+      File.open(File.join(RISE_DIR, 'auth', 'payment', 'cc.json'), 'w') do |c|
+        c.puts(JSON.pretty_generate({'cc' => number}))
+      end
+
+      # TODO make a request to the backend to store the cc in db
+
+      puts 'Credit card stored for later use.'
+    end
+
   end
 end

data/lib/core.rb

@@ -2,8 +2,8 @@
 require 'clipboard'
 require 'optparse'
 
+
 # lib files
 require 'core/transport'
 require 'core/util'
-require 'core/constants'
 require 'core/text'

data/rise-cli.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'whirly'
   s.add_runtime_dependency 'bcrypt'
   s.add_runtime_dependency 'os'
-
+  s.add_runtime_dependency 'credit_card_validations'
 end

data/scripts/test_and_build.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+cd ..
+rspec
+if [[ "$?" -ne "0"  ]]; then
+  echo -e "\033[0;31mTests failed, not building the gem\033[0;0m"
+  exit $?
+fi
+
+rubocop --fail-level W
+if [[ "$?" -ne "0"  ]]; then
+  echo -e "\033[0;31mRubocop failed, not building the gem\033[0;0m"
+  exit $?
+fi
+
+rake build

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rise-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Carter Brainerd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: credit_card_validations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 0xCB@protonmail.com
 executables:
@@ -136,6 +150,7 @@ files:
 - lib/core/transport.rb
 - lib/core/util.rb
 - rise-cli.gemspec
+- scripts/test_and_build.sh
 homepage: http://rubygems.org/gems/rise-cli
 licenses:
 - MIT