vpsmatrix 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee00ed13e94cab82e94a6c870d0dfcbb3234c13
-  data.tar.gz: 3165664532216efb285190265b023b1129760790
+  metadata.gz: 54867d7225856e252da6399526ba5b786654ffbc
+  data.tar.gz: d414d15e0e2e1355c31bd1f4ff076a3a466c3e53
 SHA512:
-  metadata.gz: a1762ce0ca5fa7b6e8de06a7dedb25ed341b2282a89185a24b6262b4d95a37b38a9e34ff55ffab3ae92907f864bdacda4ce5ec795e93e3d29c3be4a57469b4d3
-  data.tar.gz: 4d33d9302a4c3af3263b45c8af7bcef7dd43131f3a55a8ea0d7cec3d2c862536ee57d4a823ccfbdbfea556ed4d18782e0dce120821237a25a6941fb3b5b642b7
+  metadata.gz: c23a6ae2568b00297addaa9f87fb865c7eadf0655c3fb65796b367b54f95d0887b108f6c779f5fdc6c10792d6865f5493ea5593c3be95c0e101a4c2f4f1d513d
+  data.tar.gz: 0ab2a5ff899c097f6c0a9c8435e5ab709afd9eac946d9bd1ddacba53d806e1d5477037a5d76c3030b461b7d9ca9b37e7b3e8d6fe8c54557f8865e9dcf80ea131

data/lib/vpsmatrix.rb

@@ -2,5 +2,7 @@ require "vpsmatrix/version"
 require "vpsmatrix/starter"
 
 module Vpsmatrix
+  API_SERVER = "https://api.vpsmatrix.net"
+  API_TEST_SERVER = "http://localhost:3000"
   # Your code goes here...
 end

data/lib/vpsmatrix/config.rb

@@ -1,11 +1,10 @@
 require 'yaml'
 
-class Config
-
-  def initialize
-    @file_path = "config/vpsx.yml"
+class Conf
+  def initialize(home=nil)
+    @file_path = ".vpsx.yml"
+    @file_path = "#{ENV['HOME']}/.vpsx.yml" if home
     unless File.exists? @file_path
-      Dir.mkdir "config" unless Dir.exists? "config"
       File.open(@file_path, 'w') do |file|
         file.write "comment: 'Config file for VPS Matrix services'"
       end

data/lib/vpsmatrix/helpers.rb

@@ -0,0 +1,109 @@
+module Helpers
+  # simple prompt with defined text
+  # return user's input
+  def prompt(default, *args)
+    print(*args)
+    result = gets.strip.gsub("\n", '')
+    return result.empty? ? default : result
+  end
+
+  # create put request, ssl and api_key optional
+  def send_put_request endpoint, params={}, api_key=nil, ssl=false
+    uri = URI.parse(endpoint)
+
+    Net::HTTP.start(uri.host, uri.port) do |http|
+      http.use_ssl = true if ssl
+      request = Net::HTTP::Put.new(uri.request_uri)
+      request['authorization'] = "Token token=#{api_key}" if api_key
+      request.set_form_data(params)
+      http.request request
+    end
+  end
+
+  # create get request, ssl and api_key optional
+  def send_get_request endpoint, params={}, api_key=nil, ssl=false #https://api.vpsmatrix.net/uploads/get_file_list
+    uri = URI.parse(endpoint)
+    uri.query = URI.encode_www_form(params)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if ssl
+    req = Net::HTTP::Get.new(uri.path)
+    req['authorization'] = "Token token=#{api_key}" if api_key
+    http.request(req)
+  end
+
+  # user can choose which VPS to use or create new one (get one from pool of prepared VPS)
+  def resolve_vps api_key
+    res = send_get_request "#{Vpsmatrix::API_TEST_SERVER}/vps/list_available", {}, api_key
+
+    if res.code == "200"
+      vps_list = JSON.parse res.body
+      vps_string = vps_list.map {|vps| "#{vps["id"]}: #{vps["hostname"]} at #{vps["ip"]}"}
+      vps_id = prompt nil, vps_string.join("\n") + "\n"
+      chosen_vps = vps_list.select {|vps| vps["id"].to_s == vps_id}.first
+      if chosen_vps.empty?
+        puts "No such vps exists. Use existing id please." # TODO let's user continue somehow (run prompt again?)
+        abort
+      else
+        # TODO is there more efficient way how to write to YML file? This just opens and closes file again and again. Maybe open it at beginning?
+        @app_config.write("host", chosen_vps["ip"])
+        @app_config.write("host_id", chosen_vps["id"])
+      end
+      #puts chosen_vps["hostname"]
+    else
+      puts "Check your api_key in ~/.vpsx.yml; call support"
+    end
+  end
+
+  # user may choose how to get files to VPS (git or directory upload)
+  def resolve_upload_strategy
+    # TODO add possibility to choose which remote to use
+    upload_strategy = prompt("1", "How you want to upload files? \n1: Git (origin remote will be used)\n2: Copy all files in folder [NOT IMPLEMENTED]\n")
+    if upload_strategy == "1"
+      puts "You have no git repository." && abort unless Dir.exist?(".git")
+      remote = `git remote get-url origin`.gsub("\n", '')
+      @app_config.write("upload_strategy", "git")
+      @app_config.write("git_url", remote)
+      puts "#{remote} will be used."
+    elsif upload_strategy ==  "2"
+      @app_config.write("upload_strategy", "stream")
+      puts "All files in this directory will be streamed to server."
+    else
+      puts "You chose invalid option!" && abort
+    end
+  end
+
+  # choose which database will be used and where (same VPS, remote VPS, remote service)
+  def resolve_database
+    # let user choose where database is
+    ## mysql is installed with root user without pass
+    # TODO add more database types as well 'postgres'
+    database = prompt("1", "Where database should be stored? \n1: Same VPS\n Other options not available now\n")
+    if database == "1"
+      @app_config.write("database", "current_vps")
+    else
+      puts "You chose invalid option!" && abort
+    end
+  end
+
+  # choose domain which will be added to nginx
+  def resolve_domain
+    domain = prompt("example.com", "Add domain where app will run (will be used in nginx configuration)\n")
+    @app_config.write("domain", domain)
+  end
+
+  # will create user with app name on VPS; generate ssh key for him and possibly upload your pub key.
+  def create_app_user api_key
+    upload_ssh_key = prompt("Y", "Do you want to upload your public ssh key to app user on VPS? (Y/n)\n")
+    # TODO consider situation when there is no pub key
+    pub_ssh = upload_ssh_key == "Y" ? File.read("#{ENV['HOME']}/.ssh/id_rsa.pub") : ""
+
+    options = @app_config.content.merge({ssh_key: pub_ssh})
+    result = send_put_request "#{Vpsmatrix::API_TEST_SERVER}/vps/create_new_user", options, api_key
+    if result.code == "200"
+      result.body
+    else
+      puts "Check your api_key in ~/.vpsx.yml; call support" && abort
+    end
+  end
+
+end

data/lib/vpsmatrix/starter.rb

@@ -1,65 +1,157 @@
 require 'digest'
 require 'net/http'
 require 'uri'
+require 'json'
 require 'securerandom'
 require_relative 'config'
 require_relative 'upload_progress'
 
+require_relative 'helpers'
+include Helpers
+
 class Starter
 
 
+
   def self.start args
+    if ARGV[0]=~/^-/
+      switches = ARGV.shift
+      if switches == '-hv' || switches == '-vh'
+        puts "vpsx #{Vpsmatrix::VERSION}"
+        usage
+      elsif
+      switches == '-v'
+        puts "vpsx #{Vpsmatrix::VERSION}"
+        exit
+      else
+        usage
+      end
+    end
+
     @environment = args.shift
     @action = args.shift
 
-    environments = %w{demo prod}
-    fail "\nUnknown environment. Available environments: #{environments.join(', ')}" unless environments.include?(@environment)
-    actions = %w{deploy}
-    fail "\nUknown action. Available actions: #{actions.join(', ')}" unless actions.include?(@action)
-    Starter.new.send("#{@environment}_#{@action}")
+    #environments = %w{demo prod}
+    #fail "\nUnknown environment. Available environments: #{environments.join(', ')}" unless environments.include?(@environment)
+    #actions = %w{deploy init}
+    #fail "\nUknown action. Available actions: #{actions.join(', ')}" unless actions.include?(@action)
+    case @action
+      when "deploy"
+        Starter.new.send("#{@environment}_#{@action}")
+      when "config"
+        Starter.new.send(@action)
+      else
+        usage
+    end
+  end
+
+
+  # Login user; create if not existing; add api_key to ~/.vpsx.yml for future use
+  def login
+    # check ~/.vpsx.yml for api key
+    @config = Conf.new("home")
+    return @config.content['api_key'] if Conf.new("home").content['api_key']
+
+    puts "Getting api key"
+    email = prompt(nil, "Insert email: ")
+    p email
+    password = prompt(nil, "Insert password (provide new if new user): ")
+    res = send_put_request "#{API_TEST_SERVER}/login", {email: email, password: password}
+    json = JSON.parse(res.body)
+    case
+      when json["result"] == "ok"
+        # save api_key to ~/.vpsx.yml
+        puts json["api_key"]
+        @config.write 'api_key', json["api_key"]
+        @config.content['api_key']
+      when json["result"] == "new_account"
+        puts "Confirm your e-mail and run this script again"
+        # TODO find way how to get back after user confirmed mail (run login again?)
+        abort
+      else
+        puts "There is something very bad, call help."
+        abort
+    end
+  end
+
+  # Configure how app is
+  def config
+    @app_config = Conf.new
+    api_key = login
+
+    resolve_vps(api_key)
+    resolve_upload_strategy
+
+    app_name = `pwd`.split("/").last.gsub("\n", "")
+    @app_config.write("app_name", app_name)
+    ## create service user
+    # API will check existing "service" user in VPS -> for communication between user's VPSs
+    # if not it will be created with ssh keys -> these keys will be saved to ~/.vpsx.yml (used for all other VPS)
+    # take private ssh key from existing server
+
+    # TODO check if user exists
+    ssh_key_for_git = create_app_user(api_key)
+    puts ssh_key_for_git
+
+    resolve_database
+    resolve_domain
+
+    ## TODO solve this
+    ## ask user for any ENV variables he may need? Like mailgun? mail server? redis? anything else?
+    # pass ENV variables to set settings of projects
   end
 
-  #desc 'demo deploy', 'run demo deploy to deploy app to VPS Matrix demo server'
   def prod_deploy
-    fail "Not implemented yet."
+    # TODO should be more sofisticated -> now in case of problems during .vpsx.yml creation there is no possibility to go back to questionnaire
+    # TODO do some checks of validity of .vpsx.yml !!!
+    return puts("There is no config file. Run vpsx config first.") && abort unless File.exist?(".vpsx.yml") # && is_valid?
+
+    @app_config = Conf.new
+    api_key = login # use api for all the rest of communication
+
+    # send to API and install on chosen VPS
+    puts 'Deploying app'
+    uri = URI.parse("#{Vpsmatrix::API_TEST_SERVER}/uploads/deploy_to_production")
+
+    Net::HTTP.start(uri.host, 3000, :read_timeout => 500) do |http|
+      req = Net::HTTP::Put.new(uri)
+      req.add_field("Content-Type","multipart/form-data;")
+      req.add_field('Transfer-Encoding', 'chunked')
+      req['authorization'] = "Token token=#{api_key}"
+      req.set_form_data(@app_config.content)
+
+      http.request req do |response|
+        puts ""
+        response.read_body do |chunk|
+          print chunk
+        end
+        if response.code != '200'
+          puts response.code
+        end
+      end
+    end
   end
 
+  #desc 'demo deploy', 'run demo deploy to deploy app to VPS Matrix demo server'
   def demo_deploy
 
-    unless Config.new.content['ssh_key']
-      Config.new.write 'ssh_key', SecureRandom.hex
+    unless Conf.new.content['ssh_key']
+      Conf.new.write 'ssh_key', SecureRandom.hex
     end
 
     @app_name = Dir.pwd.split(File::SEPARATOR).last
-    unless Config.new.content['api_key'] && Config.new.content['api_key'].length == 32
+    unless Conf.new.content['api_key'] && Conf.new.content['api_key'].length == 32
       # ask for it to server
       # TODO check if server returns api_key
       api_key = send_get_request "https://api.vpsmatrix.net/uploads/get_api_key"
       if api_key.response.code == '200'
-        Config.new.write 'api_key', api_key.response.body
+        Conf.new.write 'api_key', api_key.response.body
       end
     end
 
     #register_email
     read_files
     stream_file
-
-    # https://api.vpsmatrix.net/uploads/get_new_files
-
-    # detect rails? DB in (pg, mysql, sqlite, nodb)?
-    # no? - do you wish us to check it?
-
-    # send SSH key and API KEY to API app
-
-    # -> OK
-    # upload app to API, use rsync or something easy
-
-
-    # -> return error message (no account, etc.)
-
-    # run deploy on API app
-    # receive DONE deploy -> show URL
-
   end
 
     def read_files
@@ -98,7 +190,7 @@ class Starter
       # stream version
       Net::HTTP.start(uri.host, uri.port, use_ssl: true, :read_timeout => 500) do |http|
         req = Net::HTTP::Put.new(uri)
-        req.add_field("Content-Type","multipart/form-data; boundary=#{@multipart_boundary}; ssh_key=#{Config.new.content['ssh_key']}; api_key=#{Config.new.content['api_key']}")
+        req.add_field("Content-Type","multipart/form-data; boundary=#{@multipart_boundary}; ssh_key=#{Conf.new.content['ssh_key']}; api_key=#{Conf.new.content['api_key']}")
         req.add_field('Transfer-Encoding', 'chunked')
         req.basic_auth("test_app", "test_app")
         File.open('tmp/files_to_send', 'rb') do |io|
@@ -121,29 +213,6 @@ class Starter
       end
     end
 
-    def send_put_request
-      uri = URI.parse("https://api.vpsmatrix.net/uploads/send_new_files")
-
-      # no stream version
-      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-        request = Net::HTTP::Put.new(uri.request_uri)
-        request.basic_auth("test_app", "test_app")
-        request.set_form_data({"file" => File.read("tmp/files_to_send")})
-        http.request request
-      end
-    end
-
-    def send_get_request endpoint, params={} #https://api.vpsmatrix.net/uploads/get_file_list
-      uri = URI.parse(endpoint)
-      uri.query = URI.encode_www_form(params)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      req = Net::HTTP::Get.new(uri.path)
-      req.basic_auth("test_app", "test_app")
-      http.request(req)
-      #res = Net::HTTP.get_response(uri)
-    end
-
     def read_dirs
       working_dir = Dir.pwd
       list_of_files = Dir.glob "#{working_dir}/**/*"
@@ -157,48 +226,24 @@ class Starter
       dirs_string
     end
 
-
-def register_email
-  puts 'Thank you very much for using vpsmatrix. You are awesome!
-
-We are just a month in this world and still working on
-full implementation of CLI functionality. We wish deployment to be the
-easiest step in development for everybody.
-'
-  puts
-  print 'Do you want to help us improve our solution [y/n] '
-
-  reply=$stdin.gets.chop
-
-  if reply.downcase == 'y'
-
-    puts 'At this point we would love to get your email address so we can kindly
-inform you when we are ready to present working functionality. And we are
-eager to hear how you feel ideal deployment should look like
-at ideas@vpsmatrix.com !'
-
+  def self.usage
     puts
-    print 'Your email: '
-
-    email = $stdin.gets.chop
-
-    uri = URI.parse("https://api.vpsmatrix.net/registration/gem")
-    Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-      request = Net::HTTP::Post.new(uri)
-      request.set_form_data({"email" => email})
-      response = http.request(request)
-      puts response.body
-   end
- 
-
-      puts 'Thank you very much. Speak to you soon!'
-
-  else
+    puts 'Usage:'
+    puts 'vpsx [-options] [environment action]'
+    puts
+    puts '  Available environments: demo'
+    puts '  Available actions:      deploy'
     puts
-    puts 'Thank you very much. We hope we meet in future where we will be more ready to help you ;)'
+    puts 'Options:'
+    puts ' -h print this help'
+    puts ' -v print version'
+    puts
+    puts 'Example:'
+    puts '  rails new fooapp'
+    puts '  cd fooapp'
+    puts '  rails g scaffold foo'
+    puts '  vpsx demo deploy'
+    exit
   end
-  puts
-
 
-  end
 end

data/lib/vpsmatrix/version.rb

@@ -1,3 +1,3 @@
 module Vpsmatrix
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vpsmatrix
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - mousse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ files:
 - bin/vpsx
 - lib/vpsmatrix.rb
 - lib/vpsmatrix/config.rb
+- lib/vpsmatrix/helpers.rb
 - lib/vpsmatrix/starter.rb
 - lib/vpsmatrix/upload_progress.rb
 - lib/vpsmatrix/version.rb