contracto 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8da2ea75522b286b373fc8a72f3e56047eb229e0
-  data.tar.gz: 16681dd43a4e02a79190f9cd669440b1da569600
+  metadata.gz: d65346ee353e34523514f7156977572115fdb8a8
+  data.tar.gz: c6d33b032c54bacc6ba750e7be59ac3b29d3f510
 SHA512:
-  metadata.gz: 8e39af6ff4d96d6cc292950bd495e2c6a5c3c84a2b97ef84b598ce4382fa8e2edc887e40c3102f9983376aa2842c4df6c43f56808aa3eb080adfdeca9df483e7
-  data.tar.gz: a0b54822ed8ef248059829e192549fb83608439c89f9f9baeea49ef6cea1ef7f87dc8d14ccc738031669bd89edcb7c9e078fe9dd6b949b55811f7755dc69a0a9
+  metadata.gz: 28fd28115eb79b3dd7dc8ca5e78d0af2de5458129319b6724b7e9e7559983e979c691d797bf0dc80c6c625e97cbdb623ce6997af242747177aed35e6ef655642
+  data.tar.gz: 904be7893b66393eabb037a6d92cf82672cc1ede82cc1c60e3e5583a652b7e571a49e9b5a1e16eb941724f31e597bfbcdb04d11b25efbd5e033424eda93c5bcb

data/contracto.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'sinatra', '~> 1.4'
-
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

data/lib/contracto.rb

@@ -1,4 +1,12 @@
 require "contracto/version"
 
 module Contracto
+  GEM_DIR = Gem::Specification.find_by_name('contracto').gem_dir
+  CONTRACTO_DIR = 'contracto'
+  CONTRACTO_TMP_DIR = '.tmp.contracto'
+  RUBY_SERVER_DIR = "#{GEM_DIR}/lib/contracto/server/ruby"
+  CONTRACT_FILENAME = 'contract.cdc.rb'
+
+  require 'contracto/installer'
+  require 'contracto/runner'
 end

data/lib/contracto/command.rb

@@ -1,26 +1,13 @@
-require 'fileutils'
-
 class Contracto::Command
   class << self
 
     def run(command, args)
       case command
         when 'install'
-          FileUtils.rm_rf 'contracto'
-          FileUtils.cp_r "#{gem_dir}/lib/contracto/server/ruby", 'contracto_'
-          FileUtils.mv 'contracto_', 'contracto'
-          unless File.exist? 'contract.cdc.rb'
-            FileUtils.mv 'contracto/contract.cdc.rb', '.'
-            puts 'created: contract.cdc.rb'
-          end
-
+          Contracto::Installer.new(args).execute
         when 'run'
-          system 'rackup contracto/config.ru'
+          Contracto::Runner.new(args).execute
       end
     end
-
-    def gem_dir
-      @gem_dir ||= Gem::Specification.find_by_name('contracto').gem_dir
-    end
   end
 end

data/lib/contracto/installer.rb

@@ -0,0 +1,13 @@
+class Contracto::Installer
+  require 'contracto/installer/local'
+
+  def initialize(args)
+    if args.empty?
+      @strategy = Contracto::Installer::Local.new
+    end
+  end
+
+  def execute
+    @strategy.execute
+  end
+end

data/lib/contracto/installer/local.rb

@@ -0,0 +1,36 @@
+require 'fileutils'
+
+class Contracto::Installer::Local
+
+  def execute
+    remove_old_dir
+    cp_server_files
+    create_contract unless contract_already_exists?
+  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

data/lib/contracto/runner.rb

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

data/lib/contracto/version.rb

@@ -1,3 +1,3 @@
 module Contracto
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contracto
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kacper Walanus
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +55,9 @@ files:
 - contracto.gemspec
 - lib/contracto.rb
 - lib/contracto/command.rb
+- lib/contracto/installer.rb
+- lib/contracto/installer/local.rb
+- lib/contracto/runner.rb
 - lib/contracto/server/ruby/config.ru
 - lib/contracto/server/ruby/contract.cdc.rb
 - lib/contracto/server/ruby/server.rb