port_map 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9144c963820f3ad67ddaa22b88da961e2089a5d
-  data.tar.gz: 580bdec31873ecad6109a1c005dc510c8e6e14f6
+  metadata.gz: b0a71849c6e5d17a906c31dce8eb840887d6e1ff
+  data.tar.gz: 62feadd3c75d9d8c9dfbc07f0b80efd4f60cf47e
 SHA512:
-  metadata.gz: b96382df0a479e97c2bbcf4a3fbd8ff082d205432dc5d6717ff1aeb9ddd83d2d5496fed1c1801c94b593c3f210ad21d7945b1bf98bf3c01b62e1decaa329de07
-  data.tar.gz: cd928903c386ee429b1ce128201891a5368af59c37e2548ba0f1910d9a8cebfec30216957dc20eca5dd35e2a56e92baa4f9edc77257f42e485137d014db9d0b0
+  metadata.gz: ad87c4e5279b4481874e1e8285f2292093811a050d0927a00a76e6c5b306b9b935eae20168985b77b124dca71fc1cb026291a80ec67acc228b2c84fa530c1519
+  data.tar.gz: b5e971e62d173e8d4cecf3b7cf14791d30fe40a3d34a38c1f780e37bf4d33928941b981b75642d1ea7b7adcec118808f8e462de57d1cca297ea05a0cd33accb7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    port_map (0.1.0)
+    port_map (0.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -50,4 +50,4 @@ DEPENDENCIES
   rspec (~> 3.4.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/README.md

@@ -95,10 +95,10 @@ Installing this gem provides four executable commands:
 ### `port_map`
 - `port_map <command>`
   1. Adjusts/Adds a dynamic port number on command (assuming command takes `-p <number>` or `--port <number>`).
-  2. Executes `create_port_map <dynamic_port_number>`
-    1. Uses a `.port_map.conf` nginx server configuration (with a `$PORT` placeholder present), for generated nginx configuration.
-    2. Using a name specified in the `PORT_MAP_NAME` environment variable.
-    1. Using a name specified from the current directory.
+  2. Executes `create_port_map <dynamic_port_number>`, which goes through the following in order until a name can be determined).
+    1. Uses a `.port_map.conf` nginx server configuration (which has a server name and `$PORT` placeholder present), this then becomes the nginx configuration.
+    2. Using a name specified in the `PORT_MAP_NAME` environment variable, this name is then used to generate a nginx configuration.
+    3. Using a name specified from the current directory, this name is then used to generate a nginx configuration.
   3. Updates `/etc/hosts` with new entry `127.0.0.1 determined_name.dev #port_map`.
   4. Reloads nginx -- `sudo nginx -s reload`.
   5. Executes `<command>`.

data/bin/create_port_map

@@ -7,6 +7,10 @@ unless (1..65535).cover?(port.to_i)
   raise 'a valid port number must be provided as the first argument'
 end
 
+if PortMap::Utilities.port_taken?(port.to_i)
+  raise 'port number is already taken'
+end
+
 server_conf = nil
 if File.exist?(PortMap::NginxConf::PORT_MAP_CONF_FILENAME)
   server_conf = PortMap::NginxConf.from_file(port, File.new(PortMap::NginxConf::PORT_MAP_CONF_FILENAME))

data/bin/remove_port_map

@@ -3,6 +3,10 @@ require 'port_map'
 
 name = ARGV[0] || Dir.pwd.split('/').last
 
+if File.exist?(PortMap::NginxConf::PORT_MAP_CONF_FILENAME)
+  name = PortMap::NginxConf.from_file('', File.new(PortMap::NginxConf::PORT_MAP_CONF_FILENAME)).name
+end
+
 port_map = PortMap::Mappings.all.detect do |element|
   element[:name] == name
 end

data/lib/port_map/hosts.rb

@@ -21,7 +21,7 @@ module PortMap
     def self.contents
       File.readlines(HOSTS_FILENAME).reject do |line|
         line.strip.match(/#{PORT_MAP_TRACK_COMMENT}$/)
-      end.join
+      end.join.strip
     end
   end
 end

data/lib/port_map/utilities.rb

@@ -7,7 +7,6 @@ module PortMap
     ZSH_CMD_STRING = "zsh -c 'source ~/.zshrc > /dev/null; PATH=%{path}; setopt aliases; eval %{cmd}'"
 
     STARTING_PORT_NUMBER = 20000
-    PORT_NUMBER_INCREMENT = 100
 
     def self.shell_cmd_wrapper(cmd)
       case ENV.fetch('SHELL')
@@ -35,9 +34,16 @@ module PortMap
     def self.next_empty_port
       highest_port = PortMap::Mappings.all.map do |port_map|
         port_map[:locations].detect { |location| location[:name] == '/' }[:proxy_pass].split(':').last.to_i
-      end.sort.reverse.first
+      end.sort.reverse.first || STARTING_PORT_NUMBER - 1
 
-      highest_port.nil? ? STARTING_PORT_NUMBER : highest_port + PORT_NUMBER_INCREMENT
+      highest_port += 1
+      highest_port += 1 while port_taken?(highest_port)
+
+      highest_port
+    end
+
+    def self.port_taken?(port)
+      system("lsof -i:#{port}", out: '/dev/null')
     end
   end
 end

data/lib/port_map/version.rb

@@ -1,3 +1,3 @@
 module PortMap
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/port_map/utilities_spec.rb

@@ -70,57 +70,36 @@ RSpec.describe PortMap::Utilities do
       it 'returns STARTING_PORT_NUMBER' do
         expect(described_class.next_empty_port).to eq(described_class::STARTING_PORT_NUMBER)
       end
-    end
-
-    context 'one port mapping exist' do
-      context 'with one location' do
-        let(:previous_highest_port_number) { 30000 }
-        let(:port_mappings) do
-          [
-            {
-              name: 'admin',
-              nginx_conf: '/usr/local/etc/nginx/servers/admin.port_map.conf',
-              server_name: 'admin.dev',
-              locations: [
-                {
-                  name: '/',
-                  proxy_pass: "http://127.0.0.1:#{previous_highest_port_number}"
-                }
-              ]
-            }
-          ]
-        end
 
-        it 'returns STARTING_PORT_NUMBER' do
-          expect(described_class.next_empty_port).to eq(previous_highest_port_number + described_class::PORT_NUMBER_INCREMENT)
+      context 'next port taken by external process' do
+        it 'returns 1 port higher than the STARTING_PORT_NUMBER' do
+          allow(described_class).to receive(:port_taken?).and_return(true, false)
+          expect(described_class.next_empty_port).to eq(described_class::STARTING_PORT_NUMBER + 1)
         end
       end
+    end
 
-      context 'with multiple locations' do
-        let(:previous_highest_port_number) { 30000 }
-        let(:port_mappings) do
-          [
-            {
-              name: 'admin',
-              nginx_conf: '/usr/local/etc/nginx/servers/admin.port_map.conf',
-              server_name: 'admin.dev',
-              locations: [
-                {
-                  name: '/',
-                  proxy_pass: "http://127.0.0.1:#{previous_highest_port_number}"
-                },
-                {
-                  name: '/test',
-                  proxy_pass: 'http://test.dev'
-                }
-              ]
-            }
-          ]
-        end
+    context 'one port mapping exist' do
+      let(:previous_highest_port_number) { 30000 }
+      let(:port_mappings) do
+        [
+          {
+            name: 'admin',
+            nginx_conf: '/usr/local/etc/nginx/servers/admin.port_map.conf',
+            server_name: 'admin.dev',
+            locations: [
+              {
+                name: '/',
+                proxy_pass: "http://127.0.0.1:#{previous_highest_port_number}"
+              }
+            ]
+          }
+        ]
+      end
 
-        it 'returns STARTING_PORT_NUMBER' do
-          expect(described_class.next_empty_port).to eq(previous_highest_port_number + described_class::PORT_NUMBER_INCREMENT)
-        end
+      it 'returns 1 port higher than the highest' do
+        allow(described_class).to receive(:port_taken?).and_return(false)
+        expect(described_class.next_empty_port).to eq(previous_highest_port_number + 1)
       end
     end
 
@@ -135,7 +114,7 @@ RSpec.describe PortMap::Utilities do
             locations: [
               {
                 name: '/',
-                proxy_pass: 'http://127.0.0.1:20720'
+                proxy_pass: "http://127.0.0.1:#{previous_highest_port_number - 1}"
               }
             ]
           },
@@ -153,8 +132,9 @@ RSpec.describe PortMap::Utilities do
         ]
       end
 
-      it 'returns STARTING_PORT_NUMBER' do
-        expect(described_class.next_empty_port).to eq(previous_highest_port_number + described_class::PORT_NUMBER_INCREMENT)
+      it 'returns 1 port higher than the highest' do
+        allow(described_class).to receive(:port_taken?).and_return(false)
+        expect(described_class.next_empty_port).to eq(previous_highest_port_number + 1)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: port_map
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kevin Jalbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler