rubyfox-server 2.16.0.1 → 2.16.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71b5d2a3a58cb2cc1f18932f1e42567866e586151c6e8f9f5461d16c0c1e15b2
-  data.tar.gz: 3c994763d0573bd68de34494b34741adbda1df6a70b05dcffdd96e5c653fcafa
+  metadata.gz: a03a6ed51cf5ce37c8b41509aca3a77d4457c3a90e08445a9e93ea28a1bd66be
+  data.tar.gz: 60191e1729c8be8ae5df8cdb7308290e4826771ab56cc6131877149a0bdaea7e
 SHA512:
-  metadata.gz: be9ad06b978a7820d23acaa170483518e03f0e2b51c994fc74f693f7ef02e8dd020c674c525181992cecdf76e8649d4aa92344d3e0cb26031043d04278110b64
-  data.tar.gz: ebe6fad363f2cd14a01c0b872c83a192b59c353b8388e134173c843737021688f03eabb1748e6a21e9d8d470a14ddf60291bd7c4e73b1eae4050fc235f9917ec
+  metadata.gz: 794e3e0b679892b6baf2334291d21e9ef34ac1a02630c666d837bd2013630fbe42dab63facfd15dafd48b41a850a7a55d24450830f0645b8b921ec668e81599a
+  data.tar.gz: d18d1dcc15b0dc516ffc014d14a836f299ea6721e0b92e031df136c86405a023009c1ea3e94c3b414b8e4dc80a91c5876a55df9b6882c500b37a7c28c6cad5d4

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
-  - 2.3.1
+  - 2.7.1
+  - 2.6.6
   - ruby-head

data/README.md

@@ -19,6 +19,7 @@ See http://www.smartfoxserver.com
     smartfox configure /path/to/smartfox /path/to/template/dir
 
     smartfox start /path/to/smartfox
+    
 
 ## Help
 
@@ -35,6 +36,24 @@ The version of this gem is tied to the real version of SmartFox Server.
 
 Example: Gem version 2.3.0.x contains SmartFox Server version 2.3.0.
 
+## Version check
+
+To enable gem version verification, add a version file to your template folder.
+
+Example: `.../version`
+```
+2.16.0
+```
+
+If the version is not satisfied, the following output is printed:
+```
+Configuration failed!
+
+Your rubyfox-server version: 2.15.0.0
+Needed version: ~>2.16.0
+```
+
+
 ## Contributing
 
 1. Fork it

data/lib/rubyfox/server/cli.rb

@@ -1,9 +1,9 @@
-require 'thor'
-require 'mime/types'
+require "thor"
+require "mime/types"
 
-require 'rubyfox/server'
-require 'rubyfox/server/version'
-require 'rubyfox/server/environment'
+require "rubyfox/server"
+require "rubyfox/server/version"
+require "rubyfox/server/environment"
 
 module Rubyfox
   module Server
@@ -15,6 +15,7 @@ module Rubyfox
       end
 
       desc "install TARGET_DIR", "Install SmartFox Server into TARGET_DIR"
+
       def install(target_dir)
         if File.exist?(target_dir)
           abort "Directory #{target_dir} already exists!"
@@ -24,10 +25,13 @@ module Rubyfox
       end
 
       desc "configure TARGET_DIR TEMPLATE_DIR", "Configure SmartFox Server in TARGET_DIR via TEMPLATE_DIR"
+
       def configure(target_dir, template_dir)
         template_dir = File.expand_path(template_dir, Dir.pwd)
         target_dir = File.expand_path(target_dir, Dir.pwd)
 
+        verify_version(template_dir)
+
         Dir["#{template_dir}/**/*"].each do |file|
           if File.file?(file)
             part = file.partition(template_dir).last
@@ -39,10 +43,14 @@ module Rubyfox
             end
           end
         end
+      rescue WrongVersionError => e
+        STDERR.puts e.message
       end
+
       map "config" => :configure
 
       desc "start TARGET_DIR", "Start SmartFox Server in TARGET_DIR"
+
       def start(target_dir)
         inside(target_dir) do
           system "sh ./sfs2x.sh"
@@ -50,6 +58,7 @@ module Rubyfox
       end
 
       desc "version", "Display version of this command"
+
       def version
         puts Rubyfox::Server::VERSION
       end
@@ -66,6 +75,31 @@ module Rubyfox
         types = MIME::Types.type_for(file)
         types.empty? || types.any? { |type| type.media_type == "text" }
       end
+
+      def verify_version(template_dir)
+        filename = "#{template_dir}/version"
+        if File.exist?(filename)
+          expected_version = File.read(filename)
+          version = Rubyfox::Server::VERSION
+
+          unless satisfied_version?(expected_version, version)
+            msg = query = <<~MSG.chomp
+              Configuration failed!
+
+              Your rubyfox-server version: #{version}
+              Needed version: ~>#{expected_version}
+            MSG
+            raise WrongVersionError.new(msg)
+          end
+        end
+      end
+
+      def satisfied_version?(expected_version, version)
+        requirement = Gem::Requirement.new("~> #{expected_version}")
+        requirement.satisfied_by?(Gem::Version.create(version))
+      end
+
+      class WrongVersionError < RuntimeError; end
     end
   end
 end

data/lib/rubyfox/server/version.rb

@@ -1,5 +1,5 @@
 module Rubyfox
   module Server
-    VERSION = "2.16.0.1"
+    VERSION = "2.16.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyfox-server
 version: !ruby/object:Gem::Version
-  version: 2.16.0.1
+  version: 2.16.0.2
 platform: ruby
 authors:
 - Peter Leitzen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -1180,7 +1180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ''