rise-cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0185e22100dd231bed9d7cc3e4fc3cc499dcf47a'
-  data.tar.gz: 7e5a6316aa1d540f4c78eb2871bce557ed1f4adb
+  metadata.gz: d388afeca104cc2795a4b124033584c59e6e2d21
+  data.tar.gz: 0eee79cafb98f3cdcfadfaff3def1b3f4d9f6f21
 SHA512:
-  metadata.gz: 9050d3c0c38806fdce3b774430191df4787da7bf7c143935d0865b241cb19fcaf6282c8de6cef250c12809a569491cbab83ec78cf884c179f25850fd96c84a7c
-  data.tar.gz: d82f52379586644f1895772621eb2992097901bb7caa1b288ff6f7f9bb2e41d321757b19b7ba654462efd94760fe26e5d4412dd65ebc99c4a4cd56f152d69018
+  metadata.gz: de5ac24bcb194d75b971242c94a24326b3e590396e29e23aded7558e0fb5f729a9f459f558c714aa7419fb9af074766951a78dfdc441baf215a47c7b8c09a63c
+  data.tar.gz: 22c48506472ce2b0c2f55351444ce2c0d2c3014f749802d0d7b9f3bc7c17f851203cb5fd569f3c94b1f08cfca0196da0b6de86fc07a3291aa07e8684514cae9f

data/.travis.yml

@@ -5,4 +5,5 @@ rvm:
 
 script:
   - bundle && bundle install
-#  - rubocop --fail-level W
+  - bundle exec rspec
+  - bundle exec rubocop --fail-level W

data/CONTRIBUTING.md

@@ -3,10 +3,15 @@ Thank you for wanting to contribute to rise!
 If you want to contribute, there are a few guidelines that
 should generally be followed.
 
+### How the contributing process goes
+1. You create a pull request doing your best to follow the do's and dont's outlined below
+2. I will review your code if it needs to be reviewed
+3. If travis and codeclimate OK the changes, your code will be merged onto master and eventually shipped with the next gem release
+
 ### Code contributions
   * **Do** your best to stick to the [Ruby style guide]
   * **Do** follow the [50/72 rule] for Git commit messages.
-  * **Do** make sure that there are no rubocop warnings on your new code
+  * **Do** make sure that there are no rubocop warnings on your new code (using `--fail-level W`)
 
 ### Pull Requests
   * **Do** have a clear, concise title
@@ -18,4 +23,4 @@ should generally be followed.
 
 
 [Ruby style guide]:https://github.com/bbatsov/ruby-style-guide
-[50/72]:http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[50/72 rule]:http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

data/Gemfile

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem 'whirly'
-gem 'paint'
 gem 'clipboard'
-gem 'rex-text'
 gem 'http'
+gem 'paint'
+gem 'rex-text'
+gem 'rspec'
 gem 'rubocop'
+gem 'whirly'

data/Gemfile.lock

@@ -5,6 +5,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     clipboard (1.1.1)
+    diff-lcs (1.3)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     http (3.0.0)
@@ -26,6 +27,19 @@ GEM
       rake
     rake (12.0.0)
     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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rubocop (0.50.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -51,6 +65,7 @@ DEPENDENCIES
   http
   paint
   rex-text
+  rspec
   rubocop
   whirly
 

data/README.md

@@ -1,7 +1,10 @@
 ![rise](https://github.com/cbrnrd/rise/raw/master/img/rise_logo.png)
-[![Code Climate](https://codeclimate.com/github/cbrnrd/rise/badges/gpa.svg)](https://codeclimate.com/github/cbrnrd/rise)
-[![Build Status](https://travis-ci.org/cbrnrd/rise.svg?branch=master)](https://travis-ci.org/cbrnrd/rise)
-[![Gem Version](https://badge.fury.io/rb/rise-cli.svg)](https://badge.fury.io/rb/rise-cli)
+                                       
+[![Code Climate](https://img.shields.io/codeclimate/github/cbrnrd/rise.svg?style=flat-square)](https://codeclimate.com/github/cbrnrd/rise)
+[![Build Status](https://img.shields.io/travis/cbrnrd/rise.svg?style=flat-square)](https://travis-ci.org/cbrnrd/rise)
+[![Gem](https://img.shields.io/gem/v/rise-cli.svg?style=flat-square)](https://rubygems.org/gems/rise-cli)
+[![Gem](https://img.shields.io/gem/dt/rise-cli.svg?style=flat-square)](https://rubygems.org/gems/rise-cli)
+[![license](https://img.shields.io/github/license/mashape/apistatus.svg?style=flat-square)](https://github.com/cbrnrd/rise/blob/master/LICENSE)
 
 # Usage
 
@@ -28,7 +31,7 @@ In order to get rise up and running, there's 2 ways you can install it.
 
 ## Built With
 
-- [Rubygems](https://rubygems.org) - the Ruby community's gem hosting service
+- [RubyGems](https://rubygems.org) - the Ruby community's gem hosting service
 - [Atom](https://atom.io/) - A hackable text editor for the 21st Century
 - [DigitalOcean](https://digitalocean.com) - Used for server hosting
 
@@ -36,9 +39,16 @@ In order to get rise up and running, there's 2 ways you can install it.
 
 Please read [CONTRIBUTING.md](https://github.com/cbrnrd/rise/blob/master/CONTRIBUTING.md) for details on our code of conduct, and the process for submitting a pull requests.
 
+## Features 
+- No need to install git, svn, or any other version control software.
+- No complex cloud setup
+- Extremely fast upload speeds
+- Unlimited unique URL's
+- No manual setup of websites
+- Your services are always served over a secure connection
+- Open source so that you can know exactly what code is runnning on your computer.
 
 ## Coming soon
-  - rise.sh registration and 24/7 server uptime
   - gzip file transfer
   - actual use of the password hash for secure uploads
 

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/TODO.txt

@@ -1,3 +1,6 @@
 TODO things for rise:
   * FIX THE DAMN AUTH ARCHITECTURE SO IT WORKS DAMN IT
   * 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
+  * Limit uploads to 50MB
+  * Add GZIP file uploads

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "rise"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "rise"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rise

@@ -34,7 +34,7 @@ OptionParser.new do |opts|
   end
 end.parse!(ARGV)
 
-if Rise::Util.is_first_run?
+if Rise::Util.first_run?
   Rise::Util.setup
   puts "\nPlease run the `rise` command again to upload your files."
   exit 0
@@ -44,17 +44,16 @@ result_url = ''
 uploader = Rise::Transport::Uploader.new(options[:directory]) unless options[:directory].nil?
 uploader = Rise::Transport::Uploader.new(Dir.pwd) if options[:directory].nil?
 
-
 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!(options[:verbose]) # Do the file upload
 
   Whirly.status = 'Done!\n'
   Clipboard.copy(result_url)
   print Paint["Your url is: #{result_url} (copied to clipboard) ", :bold]
-  puts Paint["[#{((Time.now - beginning_time)).round(2)}s]", "#95a5a6"]
+  puts Paint["[#{((Time.now - beginning_time)).round(2)}s]", '#95a5a6']
 
   puts Paint['Deployment successful!', '#3498db']
 end

data/lib/core/constants.rb

@@ -4,8 +4,11 @@ AUTH_PORT     = 4567.freeze
 UPLOAD_PORT   = 8080.freeze
 
 module Rise
+  #
+  # Holds constants used throughout the framework
+  #
   module Constants
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
     EMAIL   = '0xCB@protonmail.com'
     AUTHORS = ['Carter Brainerd']
     NAME    = 'rise-cli'

data/lib/core/transport.rb

@@ -1,28 +1,31 @@
-##
-# This file handles all communication to the Upto servers
-##
 require 'rex/text'
 require 'uri'
 require 'json'
 require 'http'
 
 module Rise
+  #
+  # Handles all communication with the rise upload server
+  #
   module Transport
-
     # Handles uploading files
     class Uploader
-
-      attr_reader :folder_path, :total_files, :include_folder, :uuid, :current_file
+      attr_reader :folder_path, :total_files, :include_folder
+      attr_reader :uuid, :current_file
       attr_accessor :files
 
-      def initialize(folder_path, include_folder=true)
+      def initialize(folder_path, include_folder = true)
         @folder_path    = folder_path
         @files          = Dir.glob("#{File.absolute_path(folder_path)}/**/*")
         @total_files    = @files.length
         @include_folder = include_folder
-        @uuid           = "#{File.basename(File.absolute_path(folder_path))}-#{Rex::Text::rand_text_alphanumeric(8)}"  # Structure: foldername-8RNDLTRS
+        @uuid           = "#{File.basename(File.absolute_path(folder_path))}-#{Rex::Text.rand_text_alphanumeric(8)}" # Structure: foldername-8RNDLTRS
       end
 
+      #
+      # Uploads the files from +folder_path+ to the upload server
+      # @return String the final URL of the uploaded contents
+      #
       def upload!(*)
         upload_uri_base = "http://rise.sh:8080/api/v1/#{@uuid}"
         access_uri = "https://rise.sh/#{@uuid}"
@@ -34,18 +37,18 @@ module Rise
         ordered_files = files.sort_by(&:length)
         ordered_files.each do |f|
           isdir = File.directory?(f)
-          final_path = File.absolute_path(f).gsub(File.expand_path(folder_path), '')
+          final_path = File.absolute_path(f).gsub(
+            File.expand_path(folder_path), '')
           uri = URI.parse("#{upload_uri_base}/#{final_path}?dir=#{isdir}")
           begin
-            HTTP.put(uri.to_s, :body => File.read(f))
+            HTTP.put(uri.to_s, body: File.read(f))
           rescue Errno::EISDIR
-            HTTP.put(uri.to_s, :body => '')
+            HTTP.put(uri.to_s, body: '')
             next
           end
         end
-        return access_uri
+        access_uri
       end
-
     end
   end
 end

data/lib/core/util.rb

@@ -8,16 +8,15 @@ require 'tempfile'
 require 'whirly'
 require_relative 'constants'
 
-#
-# Utility methods
-#
 module Rise
+  #
+  # Utility methods
+  #
   module Util
-
     #
     # Checks if rise is being run for the first time
     #
-    def self.is_first_run?
+    def self.first_run?
       !File.directory?(File.join(Dir.home, '.rise'))
     end
 
@@ -25,27 +24,29 @@ module Rise
     # Check for a new version of the gem
     #
     def self.check_for_update!
-      begin
-        output = ''
-        temp = Tempfile.new('rise-updater-output')
-        path = temp.path
-        system("gem outdated > #{path}")
-        output << temp.read
-        if output.include? 'rise-cli'
-          Whirly.start(spinner: 'line', status: Paint['New version available, updating...', 'blue']) do
-            system("gem uninstall rise-cli -v #{Rise::Constants::VERSION} > /dev/null")
-            system("gem install rise-cli > /dev/null")
-            puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
-          end
+      output = ''
+      temp = Tempfile.new('rise-updater-output')
+      path = temp.path
+      system("gem outdated > #{path}")
+      output << temp.read
+      if output.include? 'rise-cli'
+        Whirly.start(
+          spinner: 'line',
+          status: Paint['New version available, updating...', 'blue']
+        ) do
+          system("gem uninstall rise-cli -v #{Rise::Constants::VERSION} > /dev/null")
+          system("gem install rise-cli > /dev/null")
+          puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
         end
-      rescue Exception => e
-        puts "Unable to check for updates. Error: #{Paint[e.message, 'red']}"
-        exit 1
-      ensure
-        temp.close
-        temp.unlink
       end
+    rescue StandardError => e
+      puts "Unable to check for updates. Error: #{Paint[e.message, 'red']}"
+      exit 1
+    ensure
+      temp.close
+      temp.unlink
     end
+
     #
     # Creates all of the necessary files and login information
     #
@@ -54,63 +55,21 @@ module Rise
       FileUtils.mkdir(RISE_DATA_DIR)
       FileUtils.mkdir(File.join(RISE_DATA_DIR, 'auth'))
 
-      #TODO Reimplement when the backend server actually works
-      # Get the input from the user
-      #print Paint['1. Log in\n2. Sign up\n  > ', :bold]
-      #while (choice = gets.chomp!)
-      #  if choice == '1'
-      #    login
-      #    break
-      #  elsif choice == '2'
-      #    signup
-      #    break
-      #  else
-      #    puts Paint['Please type `1` or `2`', :red]
-      #    next
-      #  end
-      #end
-
-    end
-
-  end
-end
-
-# DO NOT USE
-def login
-
-  print '\nEmail: '
-  email = gets.chomp!
-  print '\nPassword: '
-  password = STDIN.noecho(&:gets)
-  hash = Digest::SHA256.hexdigest(password)
-  res = HTTP.post("http://#{DOMAIN}:#{AUTH_PORT}/login?email=#{email}&hash=#{hash}")
-  if res.code == 200
-    puts Paint['\nLogin successful!', :green, :bold]
-  else
-    puts Paint['\nLogin failed!', :red, :bold]
-    puts "Printing error: #{res.code}: #{res.body}"
-  end
-end
-
-# DO NOT USE
-def signup
-  print '\nEmail: '
-  email = gets.chomp!
-  print '\nPassword: '
-  password = STDIN.noecho(&:gets)
-  hash = Digest::SHA256.hexdigest(password)
-  res = HTTP.post("http://#{DOMAIN}:#{AUTH_PORT}/signup?email=#{email}&hash=#{hash}")
-  if res.code == 200
-    puts Paint['\nSignup successful!', :green, :bold]
-    File.open(File.join(RISE_DATA_DIR, 'auth', 'creds.json'), 'a') do |f|
-      creds_hash = {
-        'email' => email,
-        'hash'  => hash
-      }
-      f.puts(creds_hash.to_json)
+      # TODO: Reimplement when the backend server actually works
+      #  Get the input from the user
+      # print Paint['1. Log in\n2. Sign up\n  > ', :bold]
+      # while (choice = gets.chomp!)
+      #   if choice == '1'
+      #     login
+      #     break
+      #   elsif choice == '2'
+      #     signup
+      #     break
+      #   else
+      #     puts Paint['Please type `1` or `2`', :red]
+      #     next
+      #   end
+      # end
     end
-  elsif res.code == 409  # user already exists
-    puts Paint['\nSignup failed!', :red, :bold]
-    puts "Printing error: #{res.body}"
   end
 end

data/rise-cli.gemspec

@@ -5,17 +5,16 @@ require 'core'
 Gem::Specification.new do |s|
   s.name        = Rise::Constants::NAME
   s.version     = Rise::Constants::VERSION
-  s.executables = ['rise', 'setup', 'console']
+  s.executables = %w[rise setup console]
   s.date        = Time.now.strftime('%Y-%m-%d')
-  s.summary     = "Simple serverless website deployment"
+  s.summary     = 'Simple serverless website deployment'
   s.authors     = Rise::Constants::AUTHORS
   s.email       = Rise::Constants::EMAIL
   s.files       = `git ls-files`.split($/).reject { |file|
-      file =~ /^server|^spec|^pkg/
-    }
-  s.homepage    =
-    'http://rubygems.org/gems/rise-cli'
-  s.license       = 'MIT'
+    file =~ /^server|^spec|^pkg/
+  }
+  s.homepage    = 'http://rubygems.org/gems/rise-cli'
+  s.license     = 'MIT'
 
   s.add_runtime_dependency 'clipboard'
   s.add_runtime_dependency 'http'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rise-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Carter Brainerd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard