theme-juice 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0e8e49ed6690203699cd75872e527f2172b537b
-  data.tar.gz: 377ba96a2c4063cbaeabceac6d1dc0b42233989d
+  metadata.gz: 79c12bdbd0ca6886ac67ce005433fc8a463112b6
+  data.tar.gz: 7e67b5a12c39127a3050ab17572c4e344c6ab444
 SHA512:
-  metadata.gz: 0ea2fd878b16908385cbb19280471de4451b3cf172fea0b7aed822e7b2782871768a016af70b37955e28bb84426d8dfa8bc5b1165527520067d1d8bd5e425107
-  data.tar.gz: 5ac5d180650ebfa92052a92c797e5100a12ad85f8612cc12217f4ae67850ea2b9a2e3a6cbaba91213105fab351bfbf17be564aaf3350a65a5799b28d6d221930
+  metadata.gz: e0b1b5c0b15a19298f23b30fa2702478148ba1a536ceab07597d5e58f2af187b2d650b47f78c5c6acdaf39d868a6996acc85a5c1bcb0afc24b4f7d5c3141970b
+  data.tar.gz: 7ac5accc6f39612b0609d2801f4c1c3460af762a7330ceec7f694ddcf814b9413ab3c7750a71791f6109432fac31165b87bb81b164f4519bb536b6af050148ed

data/lib/theme-juice.rb

@@ -15,13 +15,13 @@ require_relative "theme-juice/version"
 require_relative "theme-juice/environment"
 require_relative "theme-juice/interaction"
 require_relative "theme-juice/interactions/teejay"
-require_relative "theme-juice/interactions/create_site_options"
-require_relative "theme-juice/interactions/delete_site_options"
+require_relative "theme-juice/interactions/create_options"
+require_relative "theme-juice/interactions/delete_options"
 require_relative "theme-juice/service"
-require_relative "theme-juice/services/config_file"
-require_relative "theme-juice/services/create_site"
-require_relative "theme-juice/services/delete_site"
-require_relative "theme-juice/services/list_sites"
+require_relative "theme-juice/services/config"
+require_relative "theme-juice/services/create"
+require_relative "theme-juice/services/delete"
+require_relative "theme-juice/services/list"
 require_relative "theme-juice/command"
 require_relative "theme-juice/commands/install"
 require_relative "theme-juice/commands/create"

data/lib/theme-juice/commands/create.rb

@@ -11,7 +11,7 @@ module ThemeJuice
         def initialize(opts = {})
             super
 
-            ::ThemeJuice::Service::CreateSite.new(@opts).create
+            ::ThemeJuice::Service::Create.new(@opts).create
         end
     end
 end

data/lib/theme-juice/commands/delete.rb

@@ -11,7 +11,7 @@ module ThemeJuice
         def initialize(opts = {})
             super
 
-            ::ThemeJuice::Service::DeleteSite.new(@opts).delete
+            ::ThemeJuice::Service::Delete.new(@opts).delete
         end
     end
 end

data/lib/theme-juice/commands/install.rb

@@ -11,7 +11,7 @@ module ThemeJuice
         def initialize(opts = {})
             super
 
-            ::ThemeJuice::Service::ConfigFile.new.install
+            ::ThemeJuice::Service::Config.new.install
         end
     end
 end

data/lib/theme-juice/commands/list.rb

@@ -11,7 +11,7 @@ module ThemeJuice
         def initialize(opts = {})
             super
 
-            ::ThemeJuice::Service::ListSites.new.list
+            ::ThemeJuice::Service::List.new.list
         end
     end
 end

data/lib/theme-juice/commands/subcommand.rb

@@ -11,7 +11,7 @@ module ThemeJuice
         def initialize(opts = {})
             super
 
-            ::ThemeJuice::Service::ConfigFile.new.subcommand @opts[:subcommand], @opts[:commands]
+            ::ThemeJuice::Service::Config.new.subcommand @opts[:subcommand], @opts[:commands]
         end
     end
 end

data/lib/theme-juice/interactions/{create_site_options.rb → create_options.rb}

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Interaction::CreateSiteOptions
+    class Interaction::CreateOptions
 
         #
         # Set up interactions and environment
@@ -105,7 +105,7 @@ module ThemeJuice
             if @opts[:use_defaults]
                 location = File.expand_path(path)
             else
-                location = File.expand_path(@interaction.prompt "Where do you want to setup the site?", default: path, path: true)
+                location = File.expand_path(@interaction.prompt "Where do you want to setup the site?", :default => path, :path => true)
             end
 
             location
@@ -123,7 +123,7 @@ module ThemeJuice
                 themes = {
                     "theme-juice/theme-juice-starter" => "https://github.com/ezekg/theme-juice-starter.git",
                     "other" => nil,
-                    "none" => false
+                    "none"  => false
                 }
 
                 if @opts[:use_defaults]
@@ -136,7 +136,7 @@ module ThemeJuice
                 when "theme-juice/theme-juice-starter"
                     @interaction.success "Awesome choice!"
                 when "other"
-                    themes[choice] = @interaction.prompt "What is the repository URL for the starter theme you would like to clone?"
+                    themes[choice] = @interaction.prompt "What is the repository URL for the starter theme that you would like to clone?"
                 when "none"
                     @interaction.notice "Next time you need to create a site without a starter theme, you can just run the 'setup' command instead."
                     @opts[:site_bare] = true
@@ -166,7 +166,7 @@ module ThemeJuice
             if @opts[:use_defaults]
                 url = "#{@opts[:site_name]}.dev"
             else
-                url = @interaction.prompt "What do you want the development url to be? (this should end in '.dev')", default: "#{@opts[:site_name]}.dev"
+                url = @interaction.prompt "What do you want the development url to be? (this should end in '.dev')", :default => "#{@opts[:site_name]}.dev"
             end
 
             validate_site_dev_url url
@@ -184,7 +184,7 @@ module ThemeJuice
                 repo = false
             else
                 if @interaction.agree? "Would you like to initialize a new Git repository?"
-                    repo = @interaction.prompt "What is the repository's URL?", indent: 2
+                    repo = @interaction.prompt "What is the repository's URL?", :indent => 2
                 else
                     repo = false
                 end
@@ -202,7 +202,7 @@ module ThemeJuice
             if @opts[:use_defaults] || @opts[:skip_db]
                 db_host = "vvv"
             else
-                db_host = @interaction.prompt "Database host", default: "vvv"
+                db_host = @interaction.prompt "Database host", :default => "vvv"
             end
 
             db_host
@@ -217,7 +217,7 @@ module ThemeJuice
             if @opts[:use_defaults] || @opts[:skip_db]
                 db_name = "#{@opts[:site_name_clean]}_db"
             else
-                db_name = @interaction.prompt "Database name", default: "#{@opts[:site_name_clean]}_db"
+                db_name = @interaction.prompt "Database name", :default => "#{@opts[:site_name_clean]}_db"
             end
 
             db_name
@@ -232,7 +232,7 @@ module ThemeJuice
             if @opts[:use_defaults] || @opts[:skip_db]
                 db_user = "#{@opts[:site_name_clean]}_user"
             else
-                db_user = @interaction.prompt "Database username", default: "#{@opts[:site_name_clean]}_user"
+                db_user = @interaction.prompt "Database username", :default => "#{@opts[:site_name_clean]}_user"
             end
 
             db_user
@@ -244,12 +244,12 @@ module ThemeJuice
         # @return {String}
         #
         def setup_site_db_pass
-            pass = Faker::Internet.password 16
+            pass = Faker::Internet.password 24
 
             if @opts[:use_defaults] || @opts[:skip_db]
                 db_pass = pass
             else
-                db_pass = @interaction.prompt "Database password", default: pass
+                db_pass = @interaction.prompt "Database password", :default => pass
             end
 
             db_pass

data/lib/theme-juice/interactions/{delete_site_options.rb → delete_options.rb}

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Interaction::DeleteSiteOptions
+    class Interaction::DeleteOptions
 
         #
         # Set up interactions and environment
@@ -43,7 +43,7 @@ module ThemeJuice
         # @return {String}
         #
         def get_site_name
-            name = @interaction.choose "Which site would you like to delete?", :red, ::ThemeJuice::Service::ListSites.new.get_sites
+            name = @interaction.choose "Which site would you like to delete?", :red, ::ThemeJuice::Service::List.new.get_sites
         end
 
         #

data/lib/theme-juice/interactions/teejay.rb

@@ -1,6 +1,16 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Interaction::TeeJay# < ::ThemeJuice::Interaction
+    class Interaction::TeeJay
+
+        #
+        # Set up interactions and environment
+        #
+        # @return {Void}
+        #
+        def initialize
+            @environment = ::ThemeJuice::Environment
+            @interaction = ::ThemeJuice::Interaction
+        end
     end
 end

data/lib/theme-juice/services/{config_file.rb → config.rb}

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Service::ConfigFile < ::ThemeJuice::Service
+    class Service::Config < ::ThemeJuice::Service
 
         #
         # @param {Hash} opts

data/lib/theme-juice/services/{create_site.rb → create.rb}

@@ -1,13 +1,13 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Service::CreateSite < ::ThemeJuice::Service
+    class Service::Create < ::ThemeJuice::Service
 
         #
         # @param {Hash} opts
         #
         def initialize(opts = {})
-            opts = ::ThemeJuice::Interaction::CreateSiteOptions.new.setup_site_options(opts)
+            opts = ::ThemeJuice::Interaction::CreateOptions.new.setup_site_options(opts)
 
             super
         end
@@ -20,18 +20,18 @@ module ThemeJuice
         def create
             @interaction.notice "Running setup for '#{@opts[:site_name]}'"
 
-            setup_project_dir          unless project_dir_is_setup?
-            setup_starter_theme        unless starter_theme_is_setup?
-            setup_vvv                  unless vvv_is_setup?
-            setup_wildcard_subdomains  unless wildcard_subdomains_is_setup?
-            setup_hosts                unless hosts_is_setup?
-            setup_database             unless database_is_setup?
-            setup_nginx                unless nginx_is_setup?
-            setup_dev_site             unless dev_site_is_setup?
-            setup_env                  unless env_is_setup?
-            setup_synced_folder        unless synced_folder_is_setup?
-            setup_wpcli                unless wpcli_is_setup?
-            setup_repo                 if     using_repo?
+            setup_project_dir         unless project_dir_is_setup?
+            setup_starter_theme       unless starter_theme_is_setup?
+            setup_vvv                 unless vvv_is_setup?
+            setup_wildcard_subdomains unless wildcard_subdomains_is_setup?
+            setup_hosts               unless hosts_is_setup?
+            setup_database            unless database_is_setup?
+            setup_nginx               unless nginx_is_setup?
+            setup_dev_site            unless dev_site_is_setup?
+            setup_env                 unless env_is_setup?
+            setup_synced_folder       unless synced_folder_is_setup?
+            setup_wpcli               unless wpcli_is_setup?
+            setup_repo                if     using_repo?
 
             if setup_was_successful?
                 @interaction.success "Setup complete!"
@@ -41,7 +41,7 @@ module ThemeJuice
                     :row   => true
                 }
 
-                if @interaction.agree? "", { simple: true }
+                if @interaction.agree? "", { :simple => true }
 
                     if restart_vagrant
                         @interaction.success "Success!"
@@ -75,7 +75,7 @@ module ThemeJuice
                 end
             else
                 @interaction.error "Setup failed. Running cleanup" do
-                    ::ThemeJuice::Service::Delete.new({ site_name: @opts[:site_name], restart: false }).delete
+                    ::ThemeJuice::Service::Delete.new({ site_name: @opts[:site_name], :restart => false }).delete
                 end
             end
         end
@@ -158,10 +158,10 @@ module ThemeJuice
         def setup_config
             @interaction.log "Creating config"
 
-            watch   = @interaction.prompt "Watch command to use",                               indent: 2, default: "bundle exec guard"
-            server  = @interaction.prompt "Deployment command to use",                          indent: 2, default: "bundle exec cap"
-            vendor  = @interaction.prompt "Vendor command to use",                              indent: 2, default: "composer"
-            install = @interaction.prompt "Commands to run on theme install (comma-delimited)", indent: 2, default: "composer install"
+            watch   = @interaction.prompt "Watch command to use",                               :indent => 2, :default => "bundle exec guard"
+            server  = @interaction.prompt "Deployment command to use",                          :indent => 2, :default => "bundle exec cap"
+            vendor  = @interaction.prompt "Vendor command to use",                              :indent => 2, :default => "composer"
+            install = @interaction.prompt "Commands to run on theme install (comma-delimited)", :indent => 2, :default => "composer install"
 
             File.open "#{@config_path}/tj.yml", "wb" do |file|
                 file.puts "commands:"

data/lib/theme-juice/services/{delete_site.rb → delete.rb}

@@ -1,13 +1,13 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Service::DeleteSite < ::ThemeJuice::Service
+    class Service::Delete < ::ThemeJuice::Service
 
         #
         # @param {Hash} opts
         #
         def initialize(opts)
-            opts = ThemeJuice::Interaction::DeleteSiteOptions.new.get_site_options(opts)
+            opts = ThemeJuice::Interaction::DeleteOptions.new.get_site_options(opts)
 
             super
         end
@@ -24,7 +24,7 @@ module ThemeJuice
                 :row   => true
             }
 
-            if @interaction.agree? "", { color: :red, simple: true }
+            if @interaction.agree? "", { :color => :red, :simple => true }
 
                 remove_dev_site      if dev_site_is_setup?
                 remove_database      if database_is_setup?

data/lib/theme-juice/services/{list_sites.rb → list.rb}

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Service::ListSites < ::ThemeJuice::Service
+    class Service::List < ::ThemeJuice::Service
 
         def initialize(opts = {})
             super

data/lib/theme-juice/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    VERSION = "0.6.6"
+    VERSION = "0.6.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Ezekiel Gabrielse
@@ -70,14 +70,14 @@ files:
 - lib/theme-juice/commands/subcommand.rb
 - lib/theme-juice/environment.rb
 - lib/theme-juice/interaction.rb
-- lib/theme-juice/interactions/create_site_options.rb
-- lib/theme-juice/interactions/delete_site_options.rb
+- lib/theme-juice/interactions/create_options.rb
+- lib/theme-juice/interactions/delete_options.rb
 - lib/theme-juice/interactions/teejay.rb
 - lib/theme-juice/service.rb
-- lib/theme-juice/services/config_file.rb
-- lib/theme-juice/services/create_site.rb
-- lib/theme-juice/services/delete_site.rb
-- lib/theme-juice/services/list_sites.rb
+- lib/theme-juice/services/config.rb
+- lib/theme-juice/services/create.rb
+- lib/theme-juice/services/delete.rb
+- lib/theme-juice/services/list.rb
 - lib/theme-juice/version.rb
 - lib/theme-juice.rb
 - LICENSE