theme-juice 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 520eb3831077f97fbcf1a4469178bfe86e399c0e
-  data.tar.gz: b15d8d8f8043ace8c6c1cf7a1d4112892cde0d38
+  metadata.gz: 73d1296a8484fbae76a72f7a5606c252bb4743ba
+  data.tar.gz: f74f4c6a09211dba3028f56b7c6559d2f466d107
 SHA512:
-  metadata.gz: 265defc28090617635b3374cd1802e6d985bbb2b70ea7a08be57632d8f73c34e74541fe0881b3161bbece095dc2240b88d1ca14285348499b069dc539b995db9
-  data.tar.gz: e2f1e7adaf39dfd45c140d94e62b1e80e66d9ae2d6da6020c97087658676b2f79ca664b86ed9a5c128b3fa4348e02cc5b57772650b0332ef8af7364866baa360
+  metadata.gz: fa89fb673767296ae6b412e086d4180f9e2ceb2a1fc29bb909a1b68d82666501fae5abdb1a68ba0bf1c692aec81e10c0cda4bb56ebbebd28ed4814f3fcdfb20f
+  data.tar.gz: 15eb808984f6de663e48b890db4d85e77d0d6543e7805e64f2ac1b4780a7194779cf5ce04149d54b4a76a92704112b79ff5f169fe3d3228986823d3b5fc30a46

data/lib/theme-juice/cli.rb

@@ -97,11 +97,11 @@ module ThemeJuice
                 clean_site_name = site.gsub(/[^\w]/, "_")[0..10]
 
                 # Location of site installation
-                if options[:use_defaults]
-                    site_location = "#{Dir.pwd}/"
+                if options[:location]
+                    site_location = options[:location]
                 else
-                    if options[:location]
-                        site_location = options[:location]
+                    if options[:use_defaults]
+                        site_location = "#{Dir.pwd}/"
                     else
                         site_location = ask " ○ Where do you want to setup the site? :", :blue, default: "#{Dir.pwd}/", path: true
                     end
@@ -123,7 +123,7 @@ module ThemeJuice
                         }
 
                         if options[:use_defaults]
-                            theme = themes["theme-juice/theme-juice-starter"]
+                            starter_theme = themes["theme-juice/theme-juice-starter"]
                         else
                             say " ○ Which starter theme would you like to use? (partial name is acceptable)", :blue
                             choose do |menu|
@@ -155,11 +155,11 @@ module ThemeJuice
                 end
 
                 # Development url
-                if options[:use_defaults]
-                    dev_url = "#{site}.dev"
+                if options[:url]
+                    dev_url = options[:url]
                 else
-                    if options[:url]
-                        dev_url = options[:url]
+                    if options[:use_defaults]
+                        dev_url = "#{site}.dev"
                     else
                         dev_url = ask " ○ What do you want the development url to be? (this should end in '.dev') :", :blue, default: "#{site}.dev"
                     end
@@ -171,11 +171,11 @@ module ThemeJuice
                 end
 
                 # Initialize a git repository on setup
-                if options[:use_defaults] || options[:skip_repo]
-                    repository = false
+                if options[:repository]
+                    repository = options[:repository]
                 else
-                    if options[:repository]
-                        repository = options[:repository]
+                    if options[:use_defaults] || options[:skip_repo]
+                        repository = false
                     else
                         if yes? " ○ Would you like to initialize a new Git repository? (y/N) :", :blue
                             repository = ask "   ○ What is the repository's URL? :", :blue

data/lib/theme-juice/version.rb

@@ -1,3 +1,3 @@
 module ThemeJuice
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Ezekiel Gabrielse