contracto 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2VmMzRlNDIxZTgzOTNkYjBhMDBlNjM5NGY3NjU3YzdmMDM0NjA5OA==
+    MjhlNmFiMGM1YWEyYmYwMTc3MjIzMGFlYTRhMTZjODFmZTQ2NTc4NA==
   data.tar.gz: !binary |-
-    NTQwMzZlMGQxMmEyMmFjOWYxYjhhZDE5ZjNlNTRjYWIwODI3ZjNjZA==
+    M2E3ODcwNmNmYjI1NDFlYWRhZDI5NjYzNzJmMTc1YzBkYTlkOGNlNg==
 SHA512:
   metadata.gz: !binary |-
-    ZGIyMzBhNGRmY2ZjZGUyYTk1MzE4ZWNmMzVkY2Q0M2Y2YzM0ZjRhMTQxNzdk
-    NWE5NDg0MTllYjA2YmI1NjBiNTQyZmExMGQ4MTdiNDA0MjFlMDMzNDQ1Y2E5
-    MGQ4NTRkZjlhNWUzNTM0ZThlZjI2YjRhZWFiODUxODJjN2M3MTg=
+    MDIzMzhkMTFlODI3ZDUyMzdkMzMyMmViOTVmZTMyMzEwYWRkNGZiY2IxYmZm
+    NzNjODk5YjA2MTQyNzIwZDI3YzgwMzRhZDJiZWNhMTFhYTc2Nzg4NDk2NTJi
+    MDU4NTMzYmExMjJjOGY2NTZmZGFmMmEwYjU2YjJjYzI1NzVjZGM=
   data.tar.gz: !binary |-
-    ZWExYWRjYjA5NmQ2MGNhYThhNzcxMTdhYjYwOWIwNzE1MDMyMTJiYjIyZTQy
-    N2Q5MWZhNTI4M2ZjMmE5NTQ1ZTU4ZDE2ODJkNjRmMmI4NzE3ZDE3YzI4ZjIz
-    NGFmODQwYTMwMGQ3MzA2ZGM0Mzg0MmUzOWFiMTYzOTNjODJmYWQ=
+    ZjE5NDBjNmNhMWU5NmU3NTIwYzQxZWMyYjYxYjhkYTVmYjE3NzMzZDc3NWQw
+    MmIzYTE3MDZkMzkyYWYxOTZjYmYxOWYzNzNhZDg1YmRlODlhM2U3ODljOTkz
+    Y2IzMTQyYmM4NDI2OGIzOGYxYzA3YWI5YjVjNDFjMDBlOGUzNDg=

data/lib/contracto.rb

@@ -8,6 +8,7 @@ module Contracto
   CONTRACT_FILENAME     = 'contract.cdc.rb'
   CONTRACT_PID_FILEPATH = "#{CONTRACTO_DIR}/server.pid"
 
+  require_relative 'contracto/errors'
   require_relative 'contracto/installer'
   require_relative 'contracto/runner'
   require_relative 'contracto/terminator'

data/lib/contracto/errors.rb

@@ -0,0 +1,5 @@
+class Contracto::CouldNotDownloadContractError < StandardError
+  def initialize(repo_url)
+    super "Could not download contract from: \"#{repo_url}\""
+  end
+end

data/lib/contracto/installer.rb

@@ -1,13 +1,40 @@
-class Contracto::Installer
-  require_relative 'installer/local'
+require 'fileutils'
 
+class Contracto::Installer
   def initialize(args)
-    if args.empty?
-      @strategy = Contracto::Installer::Local.new
-    end
   end
 
   def execute
-    @strategy.execute
+    remove_old_dir
+    cp_server_files
+    create_contract unless contract_already_exists?
+    puts 'contracto initialized'
+    puts "start writing contracts in #{Contracto::CONTRACT_FILENAME}"
+  rescue
+    revert
+  end
+
+  private
+
+  def remove_old_dir
+    FileUtils.rm_rf Contracto::CONTRACTO_DIR
+  end
+
+  def cp_server_files
+    FileUtils.cp_r Contracto::RUBY_SERVER_DIR, Contracto::CONTRACTO_TMP_DIR
+    FileUtils.mv Contracto::CONTRACTO_TMP_DIR, Contracto::CONTRACTO_DIR
+  end
+
+  def create_contract
+    FileUtils.mv "#{Contracto::CONTRACTO_DIR}/#{Contracto::CONTRACT_FILENAME}", FileUtils.pwd
+    puts "created: #{installer.CONTRACT_FILENAME}"
+  end
+
+  def contract_already_exists?
+    File.exist? Contracto::CONTRACT_FILENAME
+  end
+
+  def revert
+    # TODO: implement
   end
-end
+end

data/lib/contracto/runner.rb

@@ -1,13 +1,17 @@
 class Contracto::Runner
-  PORT = 54321
+  require_relative 'runner/base'
+  require_relative 'runner/remote'
+  require_relative 'runner/local'
 
   def initialize(args)
+    if args.first
+      @strategy = Contracto::Runner::Remote.new(args)
+    else
+      @strategy = Contracto::Runner::Local.new(args)
+    end
   end
 
   def execute
-    system "rackup #{Contracto::CONTRACTO_DIR}/config.ru -p #{PORT} -D -P #{Contracto::CONTRACT_PID_FILEPATH}"
-    # TODO: loop below should terminate after n tries
-    system "while ! echo exit | nc localhost #{PORT} > /dev/null && echo \"Waiting for server...\"; do sleep 1; done"
-    system "curl 0.0.0.0:#{PORT}"
+    @strategy.execute
   end
-end
+end

data/lib/contracto/runner/base.rb

@@ -0,0 +1,24 @@
+class Contracto::Runner::Base
+  PORT = 54321
+
+  def initialize(args)
+    @args = args
+  end
+
+  def execute
+    raise NotImplementedError
+  end
+
+  private
+
+  def start_server
+    system "rackup #{Contracto::CONTRACTO_DIR}/config.ru -p #{PORT} -D -P #{Contracto::CONTRACT_PID_FILEPATH}"
+    # TODO: loop below should terminate after n tries
+    system "while ! echo exit | nc localhost #{PORT} > /dev/null && echo \"waiting for contracto server...\"; do sleep 1; done"
+    system "curl 0.0.0.0:#{PORT}"
+  end
+
+  def server_repo_url
+    @args.first
+  end
+end

data/lib/contracto/runner/local.rb

@@ -0,0 +1,5 @@
+class Contracto::Runner::Local < Contracto::Runner::Base
+  def execute
+    start_server
+  end
+end

data/lib/contracto/runner/remote.rb

@@ -0,0 +1,29 @@
+class Contracto::Runner::Remote < Contracto::Runner::Base
+  require 'fileutils'
+
+  def execute
+    puts 'downloading contract...'
+    clone_repo || raise(Contracto::CouldNotDownloadContractError.new(server_repo_url))
+    mv_repo_files_to_current_dir
+    remove_old_repo_dir
+    start_server
+  end
+
+  private
+
+  def clone_repo
+    system "git clone -q  --depth 1 --single-branch --branch master #{server_repo_url} #{tmp_dir}"
+  end
+
+  def mv_repo_files_to_current_dir
+    system "mv #{tmp_dir}/* #{tmp_dir}/.[^.]* . 2> /dev/null"  # Could not use FileUtils for some reason
+  end
+
+  def remove_old_repo_dir
+    FileUtils.rm_rf tmp_dir
+  end
+
+  def tmp_dir
+    Contracto::CONTRACTO_TMP_DIR
+  end
+end

data/lib/contracto/server/ruby/contract.cdc.rb

@@ -1,5 +1,5 @@
 # TODO: Should require all *.cdc.rb files
 
-get '/sample' do
-  'sample GET'
+get '/dummy' do
+  'You can start working on your contract'
 end

data/lib/contracto/server/ruby/server.rb

@@ -2,5 +2,5 @@ require 'sinatra'
 require './contract.cdc.rb'
 
 get '/' do
-  'Server is working!'
-end
+  '*** Contracto server is working! ***'
+end

data/lib/contracto/version.rb

@@ -1,3 +1,3 @@
 module Contracto
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contracto
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Kacper Walanus
@@ -69,9 +69,12 @@ files:
 - contracto.gemspec
 - lib/contracto.rb
 - lib/contracto/command.rb
+- lib/contracto/errors.rb
 - lib/contracto/installer.rb
-- lib/contracto/installer/local.rb
 - lib/contracto/runner.rb
+- lib/contracto/runner/base.rb
+- lib/contracto/runner/local.rb
+- lib/contracto/runner/remote.rb
 - lib/contracto/server/ruby/config.ru
 - lib/contracto/server/ruby/contract.cdc.rb
 - lib/contracto/server/ruby/server.rb

data/lib/contracto/installer/local.rb

@@ -1,38 +0,0 @@
-require 'fileutils'
-
-class Contracto::Installer::Local
-
-  def execute
-    remove_old_dir
-    cp_server_files
-    create_contract unless contract_already_exists?
-    puts 'contracto initialized'
-    puts "start writing contracts in #{Contracto::CONTRACT_FILENAME}"
-  rescue
-    revert
-  end
-
-  private
-
-  def remove_old_dir
-    FileUtils.rm_rf Contracto::CONTRACTO_DIR
-  end
-
-  def cp_server_files
-    FileUtils.cp_r Contracto::RUBY_SERVER_DIR, Contracto::CONTRACTO_TMP_DIR
-    FileUtils.mv Contracto::CONTRACTO_TMP_DIR, Contracto::CONTRACTO_DIR
-  end
-
-  def create_contract
-    FileUtils.mv "#{Contracto::CONTRACTO_DIR}/#{Contracto::CONTRACT_FILENAME}", FileUtils.pwd
-    puts "created: #{installer.CONTRACT_FILENAME}"
-  end
-
-  def contract_already_exists?
-    File.exist? Contracto::CONTRACT_FILENAME
-  end
-
-  def revert
-    # TODO: implement
-  end
-end