locport 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60fe13278bf753c5ca419b16ed83d731d1234c8418cde3fad2219e072c58c933
-  data.tar.gz: 195ea9c9149cf05f67f67648ebccf8bad93665e18984bbffb6af97efcd804507
+  metadata.gz: 738deef26583d7f21e5ecf9a62ac7a364b648c13fa3d1d86db9bbbad322d3e43
+  data.tar.gz: ea1d8b3019ba4715ba1d41e79d2e0267b5912a09346bd72de4cb8ee7027a70eb
 SHA512:
-  metadata.gz: '0246848221d73ee34faec98b8da66622ef74364dc7f96c9831b6f0c763f6b8ca4b19c056c65158a00c41763defac07838e3bbceb80c608b3724625ad39e1b567'
-  data.tar.gz: 9b4e16a6b15447a1ab4d1aaeee8170e0f9381c3819008f45ac2c17fa8ed1636d60dd6e87ea4c2a228138864d00afd242d1ef071765b3c53b1e4ca3cd54efe46a
+  metadata.gz: 4a7e5a9f63a9d2722e060d1065d414168739a483444c4af7cdd0c1d1362edd3ce15c9759760c07140630e3d523c31d1644b2b2a257d4f2feb34272de1d389273
+  data.tar.gz: ec1eed26d60f600ed3b7e04fe31551d6453306fc145e0f677b9d2ccfc67757177ab1e00ba43ac0e4503712d9393ec23a483293ec9e8d6a4dcffe8d3d95fb4106

data/lib/locport.rb

@@ -40,11 +40,21 @@ module Locport
       Without arguments current directory name will be used and random port number assigned."
     def add(host = "#{File.basename(Dir.pwd)}.localhost")
       host_with_port, port = ensure_port(host.strip)
+      host = host_with_port.split(":").first
 
-      # if taken_by_path = port_taken?(port)
-      #   say_error "Port #{port} is already taken by #{taken_by_path}"
-      #   exit 1
-      # end
+      if used_ports.include?(port)
+        say_error "Port #{port} is "
+        say_error "already used. ", :red
+        say_error "See `locport list`"
+        exit 1
+      end
+
+      if used_hosts.include?(host)
+        say_error "Host '#{host}' is " 
+        say_error "already used. ", :red
+        say_error "See `locport list`"
+        exit 1
+      end
 
       append_to_dotfile host_with_port
       index silent: true
@@ -52,9 +62,6 @@ module Locport
       say "#{host_with_port} ", :bold 
       say "added ", :green
       say "to #{DOTFILE}"
-    rescue HostAlreadyAddedError => e
-      say_error e.message, :red
-      exit 1
     end
 
     desc "list", "List indexed projects, hosts and ports"
@@ -97,15 +104,24 @@ module Locport
       say "Projects index: #{projects_file_path}"
     end
 
-    class HostAlreadyAddedError < StandardError; end
-
     private
       def projects
-        @projects ||= load_projects
+        load_projects
+        @projects 
+      end
+
+      def used_ports
+        load_projects
+        @used_ports
+      end
+
+      def used_hosts
+        load_projects
+        @used_hosts
       end
 
       def load_projects
-        result = []
+        @projects = []
         @used_ports = []
         @used_hosts = []
 
@@ -118,7 +134,8 @@ module Locport
 
           hosts.each do |host_with_port|
             host, port = host_with_port.strip.split(":")
-            result << [ project_path, host, port ]
+            port = port.to_i
+            @projects << [ project_path, host, port ]
 
             unless @used_ports.include?(port)
               @used_ports << port
@@ -130,18 +147,25 @@ module Locport
           end
         end
 
-        result
+        @projects
       end
 
       def ensure_port(host)
         if host =~ /:([\d]+)$/
           [ host, $1.to_i ]
         else
-          port = rand PORT_RANGE
+          port = find_unused_port
           [ "#{host}:#{port}", port ]
         end
       end
 
+      def find_unused_port
+        loop do
+          port = rand PORT_RANGE
+          return port unless used_ports.include?(port)
+        end
+      end
+
       def storage_base_dir
         if Gem.win_platform?
           ENV["APPDATA"] || File.join(Dir.home, "AppData", "Roaming")
@@ -172,16 +196,6 @@ module Locport
       end
 
       def append_to_dotfile(line)
-        host = line.split(":").first
-
-        host_present = File.exist?(DOTFILE) && File.read(DOTFILE).lines.any? do
-          it.split(":").first == host
-        end
-
-        if host_present
-          raise HostAlreadyAddedError, "#{host} is already present in #{DOTFILE}"
-        end
-
         File.open(DOTFILE, "a") do |f|
           f.puts(line)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locport
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Robert Starsi