sinatra-hexacta 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185da18b74cc83d7a22b391e86d2620d1c71e70a0bea348f21959d4ca8168afd
-  data.tar.gz: 738feb302f578a42855e8afa2af5bcb8c5b83c259c89c0d15b5c21c913317a55
+  metadata.gz: a6fb503a8966bb24d1526acd9e44a6b8f798967193f7b5c465c61b86c4eb4d76
+  data.tar.gz: 1896cd47708d90de659d4e7d5253d3588331fd2372234c7c1bc152783bbd75ff
 SHA512:
-  metadata.gz: 9051be364b942161b6da74a1a60859c1f786c0dd1f8d3d99727d535e193acab914d655fc394c8b4a3b9a17b6fdc33a88316ea5182ce82bd04527e40631c0c27b
-  data.tar.gz: 18f52572803ba6cc0e992f8ba1d1af5a6f1766588cf33f583d8fed896a0154190b2091a86f87f9f2195f300231a4882dd855a15eeb4c018afb0543ac94b45aad
+  metadata.gz: 2cbd2de133ebff3475d3d8f398d6588d264d6d310194b150e45a061a7d094f03dfe7288ef5b27bc1d9cecf663504fd793e0d0da9c9d47852ce327f04c5fc1e0b
+  data.tar.gz: ff26fc925028c9a03ca3af480c9292ed8a6ba6f463180d39625fb5a6ed896d13570f41e786a9d4038235ddfd950234e0e1ef402ee8be17085e8a8eb3670319c4

data/lib/sinatra/handlers/errors.rb

@@ -13,7 +13,7 @@ module Sinatra
     end
 
     def error_template(code)
-      ErrorHandler.symlink("/lib/sinatra/views/errors/#{code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{code}.slim")
+      ErrorHandler.copy_file("/lib/sinatra/views/errors/#{code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{code}.slim")
       error code do
         if code == 500
           title = env['sinatra.error'].message.split(':')[0].gsub('#<','');

data/lib/sinatra/handlers/notifications.rb

@@ -6,8 +6,8 @@ module Sinatra
     def enable_notifications
       p "Enabling notifications..."
       NotificationHandler.setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/notifications")
-      NotificationHandler.symlink("/lib/sinatra/views/notifications.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/notifications.slim")
-      NotificationHandler.symlink_all("/lib/sinatra/views/notifications","/app/views/#{Hexacta::GEM_FILE_DIR}/notifications")
+      NotificationHandler.copy_file("/lib/sinatra/views/notifications.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/notifications.slim")
+      NotificationHandler.copy_all_files("/lib/sinatra/views/notifications","/app/views/#{Hexacta::GEM_FILE_DIR}/notifications")
 
       post '/notification' do
         if params[:user_ids].blank?

data/lib/sinatra/helpers/alerts.rb

@@ -20,7 +20,7 @@ module Sinatra
     end
 
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/alerts")
-    symlink_all("/lib/sinatra/views/alerts","/app/views/#{Hexacta::GEM_FILE_DIR}/alerts")
+    copy_all_files("/lib/sinatra/views/alerts","/app/views/#{Hexacta::GEM_FILE_DIR}/alerts")
   end
 
   helpers AlertHelper

data/lib/sinatra/helpers/charts.rb

@@ -24,7 +24,7 @@ module Sinatra
     end
 
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/charts")
-    symlink_all("/lib/sinatra/views/charts","/app/views/#{Hexacta::GEM_FILE_DIR}/charts")
+    copy_all_files("/lib/sinatra/views/charts","/app/views/#{Hexacta::GEM_FILE_DIR}/charts")
   end
 
   helpers ChartsHelper

data/lib/sinatra/helpers/inputs.rb

@@ -40,7 +40,7 @@ module Sinatra
     end
 
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/inputs")
-    symlink_all("/lib/sinatra/views/inputs","/app/views/#{Hexacta::GEM_FILE_DIR}/inputs")
+    copy_all_files("/lib/sinatra/views/inputs","/app/views/#{Hexacta::GEM_FILE_DIR}/inputs")
   end
 
   helpers InputHelper

data/lib/sinatra/helpers/libraries.rb

@@ -18,7 +18,7 @@ module Sinatra
     p "Setting up libraries directory..."
     copy_dir_structure("/lib/sinatra/public","/app/public/#{Hexacta::GEM_FILE_DIR}")
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/libraries")
-    symlink_all("/lib/sinatra/views/libraries","/app/views/#{Hexacta::GEM_FILE_DIR}/libraries")
+    copy_all_files("/lib/sinatra/views/libraries","/app/views/#{Hexacta::GEM_FILE_DIR}/libraries")
   end
 
   helpers LibrariesHelper

data/lib/sinatra/helpers/reports.rb

@@ -20,7 +20,7 @@ module Sinatra
     end
 
     setup_dir("/app/views/#{Hexacta::GEM_FILE_DIR}/reports")
-    symlink_all("/lib/sinatra/views/reports","/app/views/#{Hexacta::GEM_FILE_DIR}/reports")
+    copy_all_files("/lib/sinatra/views/reports","/app/views/#{Hexacta::GEM_FILE_DIR}/reports")
   end
 
   helpers ReportHelper

data/lib/sinatra/hexacta.rb

@@ -9,43 +9,30 @@ module Sinatra
   module Hexacta
     GEM_FILE_DIR = "sinatra-hexacta"
 
-    def symlink(original_path, link_path)
-      File.symlink "#{Gem.loaded_specs["sinatra-hexacta"].gem_dir}#{original_path}", "#{link_path}" unless Gem.loaded_specs["sinatra-hexacta"].nil? || File.exist?("#{link_path}")
+    def gem_path
+      File.expand_path("../..",__dir__)
     end
 
-    def symlink_all(original_path, link_path)
-      Dir.foreach("#{Gem.loaded_specs["sinatra-hexacta"].gem_dir}#{original_path}") do |child|
-        symlink("#{original_path}/#{child}","#{link_path}/#{child}") unless child == '.' || child == '..'
-      end unless Gem.loaded_specs["sinatra-hexacta"].nil?
+    def copy_file(original_path, link_path)
+      IO.copy_stream("#{gem_path}#{original_path}",link_path) unless File.exist?(link_path) && FileUtils.compare_file("#{gem_path}#{original_path}",link_path)
     end
 
-    def setup_dir(path)
-      unless Gem.loaded_specs["sinatra-hexacta"].nil?
-        FileUtils.remove_dir path if Dir.exist? path
-        FileUtils.mkdir_p path
+    def copy_all_files(original_path, link_path)
+      Dir.foreach("#{gem_path}#{original_path}") do |child|
+        copy_file("#{original_path}/#{child}","#{link_path}/#{child}") unless child == '.' || child == '..'
       end
     end
 
+    def setup_dir(path)
+      FileUtils.mkdir_p path
+    end
+
     def copy_dir_structure(original_path, destination_path)
-      unless Gem.loaded_specs["sinatra-hexacta"].nil?
-        FileUtils.remove_dir destination_path if Dir.exist? destination_path
-        FileUtils.copy_entry("#{Gem.loaded_specs["sinatra-hexacta"].gem_dir}#{original_path}", destination_path)
-      end
+      FileUtils.copy_entry("#{gem_path}#{original_path}", destination_path)
     end
   end
 end
 
-if Gem.loaded_specs["sinatra-hexacta"].nil?
-  p "ERROR: Sinatra hexacta gem was not found"
-else
-  p "Sinatr hexacta gem was found in #{Gem.loaded_specs["sinatra-hexacta"].gem_dir}"
-end
-
-unless Gem.loaded_specs["sinatra-hexacta"].nil?
-  FileUtils.remove_dir "/app/views/sinatra-hexacta" if Dir.exist? "/app/views/sinatra-hexacta"
-  FileUtils.remove_dir "/app/public/sinatra-hexacta" if Dir.exist? "/app/public/sinatra-hexacta"
-end
-
 require_relative 'helpers/init'
 require_relative 'handlers/init'
 require_relative 'extensions/init'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Marco Zanger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies: []
 description: A gem to support general functionality accross all apps
 email: mzanger@hexacta.com