contracto 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzNkYThkNzlhMWZjNjI1ZWQ1MjYwNTIxMmUwMWVlY2NhNWEyMjMxYg==
+    MDljYTgwNGI5NjBjOGE4YjFkOTJmZjEyZjViNmNhODNhMTM2OTA1NQ==
   data.tar.gz: !binary |-
-    NDZmNzFiNGFjYWMyZjJkZDBlMjQ2N2IyNzQ3ZDRjZmFkNmYyODRmZg==
+    MDdjMzZkNmNjNTk4NmVmYjRiY2Y1MzhhZjJhZjYzMDFlYzExN2M3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDkwZjRlMzEyYWE2ZDJlOTIzNWIyNTJjNTMxZDU4NzYyYjZiMjczOWMxZjU4
-    N2MwNjYxMDQ4ZjE5YTg4MTA1NGQzNGE4YTU3MjY4MzdkM2ViOWIzY2YwYzE2
-    NjEwZTFhMWQ0NzdjMDFjNGIwYjkxMTQ4NzU0N2VhOTU1ZTE3ODk=
+    MTczMzMzMTU0ZGZlZWFmNjU1ZTcyMmNjMjIyNmI3NWQ3NWU1OWUwOGU1ZmQy
+    M2IxYWFjYzk4NGU2YTIwOWQwNTZlNzhjNTkxY2E1Y2FmMjFiNTAzMmQxNDM4
+    Yjc2NTU2YjUyZjExYzk1ZGQxM2YwNzgwMTA4YWYzY2YyZmVjZmM=
   data.tar.gz: !binary |-
-    ZWFlMTZmYjQ2ODhkZGVjNGE5ZjVmM2M2YmZmMWI0ZGM0NmI3ZjllODNhMGQy
-    OTRkNzFiZTYzYTUxZWI3MjEzNWM0OWZiM2YxOTMxMDZhMTQwNjQ5NzdkYWRi
-    ODc5NmY3ZDc2MGY5NTQzZDBkZTU2YTNlZWUzYmMzMjU5MTcyODQ=
+    NjA1ZDVmOTY3YTczYTczMzI5Zjc5M2M3ODBkZTliOThhN2RkMTE3OGU1ZGM0
+    N2FlOTQzN2RiMmU2ZmQxNWZiZmVlMzIzYzVlYTc3N2MyMDVhNjhiM2VmZjQ1
+    MmEwOWIzMmNiZjQ3Y2M4NWZkNGY1YmRjYzk3OGUwYmU4N2I4N2U=

data/lib/contracto.rb

@@ -6,7 +6,9 @@ module Contracto
   CONTRACTO_TMP_DIR = '.tmp.contracto'
   RUBY_SERVER_DIR = "#{GEM_DIR}/lib/contracto/server/ruby"
   CONTRACT_FILENAME = 'contract.cdc.rb'
+  CONTRACT_PID_FILEPATH = "#{CONTRACTO_DIR}/server.pid"
 
   require 'contracto/installer'
   require 'contracto/runner'
+  require 'contracto/terminator'
 end

data/lib/contracto/command.rb

@@ -3,10 +3,12 @@ class Contracto::Command
 
     def run(command, args)
       case command
-        when 'install'
+        when 'init'
           Contracto::Installer.new(args).execute
-        when 'run'
+        when 'start'
           Contracto::Runner.new(args).execute
+        when 'stop'
+          Contracto::Terminator.new(args).execute
       end
     end
   end

data/lib/contracto/installer/local.rb

@@ -6,6 +6,8 @@ class Contracto::Installer::Local
     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

data/lib/contracto/runner.rb

@@ -5,7 +5,8 @@ class Contracto::Runner
   end
 
   def execute
-    system "rackup contracto/config.ru -p #{PORT} &"
+    system "rackup #{Contracto::CONTRACTO_DIR}/config.ru -p #{PORT} -D -P #{Contracto::CONTRACT_PID_FILEPATH}"
     system "while ! echo exit | nc localhost #{PORT} > /dev/null && echo \"Waiting for server...\"; do sleep 1; done"
+    system "curl 0.0.0.0:#{PORT}"
   end
 end

data/lib/contracto/terminator.rb

@@ -0,0 +1,10 @@
+class Contracto::Terminator
+  def initialize(args)
+  end
+
+  def execute
+    puts 'killing server...'
+    Process.kill(15, File.read(Contracto::CONTRACT_PID_FILEPATH).to_i)
+    puts 'server terminated'
+  end
+end

data/lib/contracto/version.rb

@@ -1,3 +1,3 @@
 module Contracto
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contracto
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kacper Walanus
@@ -75,6 +75,7 @@ files:
 - lib/contracto/server/ruby/config.ru
 - lib/contracto/server/ruby/contract.cdc.rb
 - lib/contracto/server/ruby/server.rb
+- lib/contracto/terminator.rb
 - lib/contracto/version.rb
 homepage: ''
 licenses: