cliz 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de4a5cd7ac9ce9598f60e1674053920a3362d5cf93a9fc19c1b879845fb06567
-  data.tar.gz: 23e5e440771e05f9e15a8b8a508de4747fccf613dc1af6e459cce7c9bad85c5c
+  metadata.gz: f7e969650b2cf9c73bcc4ccd6828ae1c017e3b28636c53ab5df834f22b3578be
+  data.tar.gz: c65d9ec553353788a99a7885582ba078cfde12a8f073a341ed554facdf271ab2
 SHA512:
-  metadata.gz: 7e8d8bde06fc90d008c29ccfa234157a9d26d160557ecc6cef78cd201db533c5ec13cedfd1f4a3d05b2b5b33bef7b4dbe43cb4e9611b3025070f3594a0232892
-  data.tar.gz: 504e21a63bd2359ce50ef4e567fbb3b894c2d92aed4a1c37e2d40f105b4661ba11e698706891a96e564b6ef2cb799c6f0d5ac8cefb527083dab1eeeeab011f1d
+  metadata.gz: 42bf0f66ac2f39af3cd067f817251d84f68fa93cc79cb53b8bff39500208e3d817cc6bc10ca41acef0046b61e2b75075b7c66e5d2812c0517c0ec5b6bb56babe
+  data.tar.gz: 3055bdfb251fd53754a2d0e1c0ca40f3ca07e6d5b12cafe7bf11fb585978aa510177d74477f350ba1f874d8ad69e2b61d48112b9d7691c90e9b9436c48c7130e

data/bin/cliz

@@ -1,42 +1,27 @@
 #!/usr/bin/env ruby
 
-require 'securerandom'
 require 'fileutils'
 require 'yaml'
-require 'fileutils'
 require_relative '../lib/functions.rb'
 
 include Cliz
 
-
-
 config = YAML.load(File.read('config.yml'))
 output_dir = config['output_dir']
 
+# Is this the right place for this?
+# Could we have a initialization function?
 FileUtils.mkdir_p File.join output_dir, 'reverse-index'
 
 url = ARGV[0]
 short_suggestion = ARGV[1]
+short_urls = nil
 
-unless short_suggestion
-  # check for reverse index
-  reverse_index_file = File.join output_dir, 'reverse-index', "#{Digest::SHA2.hexdigest url}"
-
-  if File.exist? reverse_index_file
-    base_domain = config['base_domain']
-    paths = File.open(reverse_index_file).readlines
-    for path in paths
-      puts File.join base_domain, path
-    end
-    exit
-  end
+if short_suggestion
+  short_urls = [short(config, url, short_suggestion)]
+else
+  short_urls = previously_shortened_urls(config, url)
+  short_urls ||= [short(config, url)]
 end
 
-
-short_url = short config, url, short_suggestion
-
-# do reverse index
-
-reverse_index config, short_url
-
-puts short_url
+print_urls(short_urls)

data/lib/functions.rb

@@ -71,9 +71,12 @@ module Cliz
     folder_path = get_a_folder_path output_dir, short_suggestion
     create_index_file(url, folder_path)
 
-    system("sh #{deploy_script}") if deploy_script
+    short_url = File.join base_domain, short_suggestion
+    reverse_index config, short_url
 
-    File.join base_domain, short_suggestion
+    system("sh #{deploy_script}") if deploy_script
+    
+    short_url
   end
 
   ##
@@ -94,7 +97,7 @@ module Cliz
 
   def reverse_index config, short_url
     output_dir = config['output_dir']
-    
+
     long_url = long_url config, short_url
 
     reverse_index_file = File.join output_dir, 'reverse-index', "#{Digest::SHA2.hexdigest long_url}"
@@ -104,4 +107,28 @@ module Cliz
       f.puts path(config, short_url)
     end
   end
+
+  def previously_shortened_urls(config, url)
+    output_dir = config['output_dir']
+
+    reverse_index_file = File.join output_dir, 'reverse-index', "#{Digest::SHA2.hexdigest url}"
+
+    if File.exist? reverse_index_file
+      urls = []
+      base_domain = config['base_domain']
+      paths = File.open(reverse_index_file).readlines
+
+      for path in paths
+        urls << File.join(base_domain, path)
+      end
+    end
+
+    urls
+  end
+
+  def print_urls(urls)
+    for url in urls
+      puts url
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cliz
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Karthikeyan A K