sct 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2cc3d1d71c372b97290ca23b05a60bfeabd5240a81ed72ca16c433f1ee6dae5
-  data.tar.gz: e85b9c5e1643ee6d9eb794c54e187f9e7637ccb89c37943383cab8802938af7b
+  metadata.gz: d056bb6dee0b4f63c1f1480dcf45fb72ddc7c56d438c22e198b516337226d10f
+  data.tar.gz: 70e73a9e31b06b96f3e0c39cdc68e830e4eb155f6bf3656d8d8906244c4dbab2
 SHA512:
-  metadata.gz: 42001ffa5ccd0cf558a1f38fde92e58908b7621e2b3a98c975cb2f40afd2ec34c6ce9fd1fa105b6cc6097143f272a2407d3f31573cd4429937babc490d103375
-  data.tar.gz: 23fbd32a6a5cc1cdaa0fc7b32006097a16bcd2bb4b5b543f57dc63e3ba6c806bcb163b0f7b1a332a70f747c208b9db81a72c3a1633b0d5a75b8b10295ea83d06
+  metadata.gz: 19cc423a5d5e5e52aa63ed5f2c995c7b87f0c7e8802ede561ecc9326f438e6bc0e1be45e79c63adad37b1bd8db378518d9ec4491fc59b752a32f841991658b1a
+  data.tar.gz: ca64a6c7ab008432005c5f6e53498de49fa3d608be78980963fd79fe4ec79940d0c4364418059dd78c05b7966fa8cdfa06934dea089eee6cc985fa42daae8a5a

data/.gitlab/merge_request_templates/DefinitionOfDone.md

@@ -3,8 +3,10 @@ The Definition of a Done Code Review
 |          by _The Team_           |
 |---------------------------------:|
 
-- [ ] Approved (thumbs up) by three other team members (from different operating systems).
 - [ ] Verified if it worked on all operating systems.
+    - [ ] Windows
+    - [ ] Ubuntu
+    - [ ] MacOs
 - [ ] Verified if it solved the problem.
 - [ ] Verified if the help section is updated.
 - [ ] Verified if it complied with Ruby code standards.

data/Gemfile.lock

@@ -1,25 +1,21 @@
 PATH
   remote: .
   specs:
-    sct (0.1.3)
+    sct (0.1.15)
       class_interface (~> 0.1.1)
       colored (~> 1.2)
       commander (~> 4.4.7)
       highline (>= 1.7.2)
-      hosts (~> 0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    class_interface (0.1.1)
+    class_interface (0.1.2)
     colored (1.2)
     commander (4.4.7)
       highline (~> 2.0.0)
     diff-lcs (1.3)
     highline (2.0.3)
-    hosts (0.1.1)
-      linebreak (~> 2.0.1)
-    linebreak (2.0.1)
     rake (10.5.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

data/lib/sct/commands/hostfile.rb

@@ -1,4 +1,3 @@
-require 'hosts'
 require 'sct/command_interface'
 
 module Sct
@@ -25,6 +24,29 @@ module Sct
 
       ingressAddress = Sct::Helpers.ingressAddress
 
+      entries = [
+        {
+          host: "spend.cloud.local",
+          comment: "The spend cloud ingress url"
+        },
+        {
+          host: "mail.spend.cloud.local",
+          comment: "The spend cloud mail url"
+        },
+        {
+          host: "config.spend.cloud.local",
+          comment: "The spend cloud config url"
+        },
+        {
+          host: "spend-cloud.spend.cloud.local",
+          comment: "The spend cloud web app url"
+        },
+        {
+          host: "docs.spend.cloud.local",
+          comment: "The spend cloud documentation url"
+        }
+      ]
+
       if options.path
         hosts_paths = [options.path]
       else
@@ -36,85 +58,22 @@ module Sct
       end
 
       hosts_paths.each do |hosts_path|
+        line_ending = hosts_path == "/mnt/c/Windows/System32/drivers/etc/hosts" ? "\r\n" : "\n"
 
-        begin
-          hosts = Hosts::File.read(hosts_path) 
-
-          if ([ingressAddress].any? { |ip| hosts.to_s =~ /#{ip}/ })
-            puts "Skipped patching #{hosts_path} (already up to date)".green
-          else
-            validate_if_exist(hosts)
-            add_entry(ingressAddress, hosts)
-            hosts.write
-            puts "Patched #{hosts_path} with #{ingressAddress}".green
-          end
-        rescue ArgumentError
-          puts "🔥 Can't read your hostfile".red
-          puts " Please update your hostsfile manually at #{hosts_path} with the following entries"
-          puts " "
-          puts "    #{ingressAddress} spend.cloud.local".yellow
-          puts "    #{ingressAddress} mail.spend.cloud.local".yellow
-          puts "    #{ingressAddress} config.spend.cloud.local".yellow
-          puts "    #{ingressAddress} spend-cloud.spend.cloud.local".yellow
-          puts "    #{ingressAddress} docs.spend.cloud.local".yellow
-          puts " "
-        end
-
-      end
-
-    end
-
-    def add_entry(url, hosts)
-      spend = Hosts::Entry.new(
-          url,
-          'spend.cloud.local',
-          :comment => 'The spend cloud ingress url'
-      )
-
-      mail = Hosts::Entry.new(
-          url,
-          'mail.spend.cloud.local',
-          :comment => 'The spend cloud mail url'
-      )
-
-      config = Hosts::Entry.new(
-          url,
-          'config.spend.cloud.local',
-          :comment => 'The spend cloud config url'
-      )
-
-      spend_cloud = Hosts::Entry.new(
-          url,
-          'spend-cloud.spend.cloud.local',
-          :comment => 'The spend cloud web app url'
-      )
-
-      docs = Hosts::Entry.new(
-          url,
-          'docs.spend.cloud.local',
-          :comment => 'The spend cloud documentation url'
-      )
-
-      hosts.elements << spend
-      hosts.elements << mail
-      hosts.elements << config
-      hosts.elements << spend_cloud
-      hosts.elements << docs
-
-    end
-
-    def validate_if_exist(array)
-      rejectArray = Array.new
+        lines = File.readlines hosts_path
 
-      array.to_s.each_line.with_index do |line, index|
+        # select the lines that do not include any entry
+        lines = lines.select { |line| ! entries.any? { |entry| line.include? entry[:host] } }
 
-        if (line =~ /(?:spend\.cloud\.local)./)
-          rejectArray.push(index)
+        # add entries
+        entries.each do |entry|
+          lines << "#{ingressAddress} #{entry[:host]} # #{entry[:comment]}#{line_ending}"
         end
 
-      end
+        File.write hosts_path, lines.join
 
-      array.elements.delete_if.each_with_index { |value, index| rejectArray.include? index }
+        puts "Patched #{hosts_path} with #{ingressAddress}".green
+      end
 
     end
 

data/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

data/sct.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "class_interface", "~> 0.1.1"
   spec.add_dependency "colored", "~> 1.2"
-  spec.add_dependency "hosts", "~> 0.1.1"
   spec.add_dependency "commander", "~> 4.4.7"
   spec.add_dependency "highline", ">= 1.7.2"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_interface
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: hosts
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement