lei 0.2.6 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28601daa4b935e989a91bb53bbb2e140bb1931ce4981b63afb167a6b65fea6ce
-  data.tar.gz: 67eb66caadc418b360f87a67ee101361d4af3defbd4f118482807e5c244962f4
+  metadata.gz: d30e6062790a6860bbf317d2d18947eb7841f24dd7615a1a0fdfc66353262d1f
+  data.tar.gz: 9542dc2befb30ee7baa1aa648d4fb0c60352cda495ba8e0d0bc805d16b779db3
 SHA512:
-  metadata.gz: 02b9e538e962fd4412d18169286afcbe31fc4afa545bff4cf0351d32f93a8c521cd9ae9aac2871639ba33a761e72ca95ae2aa8b4a6619a8ee7e2e572731a55a6
-  data.tar.gz: 31eda6c8d271fc42ac7f73a3a65f4ef8a679211b0923843c83e024710a6a2b9fde5acaf843aa130da09adce6d92bc746eb1f9394585472db64207054c10b441d
+  metadata.gz: a9a0f481acf6e65ba7a2962b190b56f504b392cdc2ecbb30f62337014ddc58652f6c3f25a2969570f32fd389e628d74c1a62e19a85bd0b3acd59144e7e509659
+  data.tar.gz: 910734e17b91a2447f4947aeaad68a1be202ce891b6ef63adaf6752c9fb75197eb842d45f45eb824266234db9eef66d21e044bcedaa08892248c6fa2c147f174

data/bin/docker_utils.rb

@@ -0,0 +1,15 @@
+def dockerExists
+    versionStdout = `docker -v`
+
+    return versionStdout != nil && versionStdout != ""
+end
+
+def dockerNameArgIsValid(nameArg)
+    return nameArg != nil && nameArg != "" && nameArg.match(/^\w+$/)
+end
+
+def dockerVersionArgIsValid(versionArg)
+    return versionArg != nil &&
+        versionArg != "" &&
+        versionArg.match(/^[0-9]\.[0-9]\.[0-9]$/)
+end

data/bin/functions.rb

@@ -4,8 +4,4 @@ end
 
 def makeFiles(files, loc)
     files.each { |k, v| `touch #{loc}/#{k}; echo '#{v}' > #{loc}/#{k}` }
-end
-
-def dockerVersionArgIsValid(versionArg)
-
 end

data/bin/lei

@@ -45,11 +45,19 @@ class Lei
     end
 
     def docker_deploy
+        require "#{@root}/docker_utils"
+
+        if !dockerExists
+            puts "Docker does not exist; please install it before running this command."
+
+            return
+        end
+
         arg1 = ARGV[1]
         arg2 = ARGV[2]
 
-        if !arg1.match(/\w/)
-            puts "Please supply project name (one word)."
+        if !dockerNameArgIsValid(arg1)
+            puts "Please supply project name (one word, alphanumeric only, _ allowed)."
 
             return
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lei
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.9
 platform: ruby
 authors:
 - Ezra Chang
@@ -57,6 +57,7 @@ files:
 - bin/_app/_welcome.rb
 - bin/_new/_content.rb
 - bin/_new/_custom.rb
+- bin/docker_utils.rb
 - bin/functions.rb
 - bin/lei
 - example/controllers/content.rb