theme-juice 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 236d1860b3a9b9570d92de72d33415e9f518509f
-  data.tar.gz: 8adc03ca3f6e57a2e5bb0488fb50c1f183dac5c9
+  metadata.gz: b1ec1d079ea72b80319db439459fd0a7d5ab0dbe
+  data.tar.gz: 129075f275d74a94cf237a44fc878c67c560a286
 SHA512:
-  metadata.gz: 271ce4f26c47d41c7854e4b3a70b3f302581431c8a802f4fc6bc53522781833cb2f8cd7251d426a2c8f28e7d82450152421889d9de7697f362fd30ce74e766ef
-  data.tar.gz: 71246886e711f558117cac03c12b6dc83a74efc6d302c3a5e4a6571c43d01063fd4c5fb109382a7230a204e3ea6d9f8f453469e3e9388c5cc7ed284015d1438a
+  metadata.gz: 227ab16e983253316a6b8c665c20f5755fa8ec4e604e8d17e7b40517756409a2c7901bc5d9b86cd3179caa1f525fb3e424acb05e050d8230e473aa981eac5b71
+  data.tar.gz: c7ca67087eca3df42cdc681b941e57dc9ebffa76c34980beabb2b0d0959be85c23787ca2f0d4ce6bbe52c94237a30b7fec3ec1cdeebfd9fb295fcb5795ae3502

data/lib/theme-juice/cli.rb

@@ -6,15 +6,15 @@ module ThemeJuice
         #
         # Command aliases
         #
-        map %w[--version -v]             => :version
-        map %w[new, add, build, make]    => :create
-        map %w[prep]                     => :setup
-        map %w[remove, trash, teardown]  => :delete
-        map %w[sites, show]              => :list
-        map %w[assets, dev]              => :watch
-        map %w[dependencies, deps]       => :vendor
-        map %w[deploy, remote]           => :server
-        map %w[vagrant, vvv]             => :vm
+        map %w[--version -v]            => :version
+        map %w[new, add, build, make]   => :create
+        map %w[prep]                    => :setup
+        map %w[remove, trash, teardown] => :delete
+        map %w[sites, show]             => :list
+        map %w[assets, dev]             => :watch
+        map %w[dependencies, deps]      => :vendor
+        map %w[deploy, remote]          => :server
+        map %w[vagrant, vvv]            => :vm
 
         #
         # Class options
@@ -41,12 +41,12 @@ module ThemeJuice
         end
 
         desc "create [NAME]", "Create new site and setup VVV environment"
-        method_option :bare,         :type => :boolean, :aliases => "-b",                    :desc => "Create a VVV site without a starter theme"
         method_option :name,         :type => :string,  :aliases => "-n", :default => false, :desc => "Name of the development site"
         method_option :location,     :type => :string,  :aliases => "-l", :default => false, :desc => "Location of the local site"
         method_option :theme,        :type => :string,  :aliases => "-t", :default => false, :desc => "Starter theme to install"
         method_option :url,          :type => :string,  :aliases => "-u", :default => false, :desc => "Development URL of the site"
         method_option :repository,   :type => :string,  :aliases => "-r",                    :desc => "Initialize a new Git remote repository"
+        method_option :bare,         :type => :boolean,                                      :desc => "Create a VVV site without a starter theme"
         method_option :skip_repo,    :type => :boolean,                                      :desc => "Skip repository prompts and use defaults"
         method_option :skip_db,      :type => :boolean,                                      :desc => "Skip database prompts and use defaults"
         method_option :use_defaults, :type => :boolean,                                      :desc => "Skip all prompts and use default settings"
@@ -63,13 +63,13 @@ module ThemeJuice
             @interaction.hello
 
             opts = {
-                :site_bare          => options[:bare],
                 :site_name          => name || options[:name],
                 :site_location      => options[:location],
                 :site_starter_theme => options[:theme],
                 :site_dev_location  => nil,
                 :site_dev_url       => options[:url],
                 :site_repository    => options[:repository],
+                :site_bare          => options[:bare],
                 :skip_repo          => options[:skip_repo],
                 :skip_db            => options[:skip_db],
                 :use_defaults       => options[:use_defaults]
@@ -99,13 +99,13 @@ module ThemeJuice
             @interaction.hello
 
             opts = {
-                :site_bare          => true,
                 :site_name          => name || options[:name],
                 :site_location      => options[:location],
                 :site_starter_theme => false,
                 :site_dev_location  => nil,
                 :site_dev_url       => options[:url],
                 :site_repository    => options[:repository],
+                :site_bare          => true,
                 :skip_repo          => options[:skip_repo],
                 :skip_db            => options[:skip_db],
                 :use_defaults       => options[:use_defaults]

data/lib/theme-juice/command.rb

@@ -5,6 +5,11 @@ module ThemeJuice
         include ::Thor::Actions
         include ::Thor::Shell
 
+        #
+        # @param {Hash} opts
+        #
+        # @return {Void}
+        #
         def initialize(opts = {})
             @environment = ::ThemeJuice::Environment
             @interaction = ::ThemeJuice::Interaction

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

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

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

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

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

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

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

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

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

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

data/lib/theme-juice/interaction.rb

@@ -102,7 +102,6 @@ module ThemeJuice
             # @return {Bool}
             #
             def agree?(question, opts = {})
-
                 format_message question, {
                     :color => opts[:color] || :blue,
                     :icon  => :question

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

@@ -1,287 +1,277 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Interaction::Create
-
-        #
-        # Set up interactions and environment
-        #
-        # @return {Void}
-        #
-        def initialize
-            @environment = ::ThemeJuice::Environment
-            @interaction = ::ThemeJuice::Interaction
-        end
+    module Interaction::Create
 
-        #
-        # Set up needed site options
-        #
-        # @param {Hash} opts
-        #
-        # @return {Hash}
-        #
-        def setup_site_options(opts = {})
-            @opts = opts
-
-            if @environment.yolo
-                @opts[:use_defaults] = true
-            end
+        @environment = ::ThemeJuice::Environment
+        @interaction = ::ThemeJuice::Interaction
 
-            required_opts = [
-                :site_name,
-                :site_name_clean,
-                :site_location,
-                :site_starter_theme,
-                :site_dev_location,
-                :site_dev_url,
-                :site_repository,
-                :site_db_host,
-                :site_db_name,
-                :site_db_user,
-                :site_db_pass
-            ]
-
-            required_opts.each do |opt|
-                @opts[opt] = self.send "setup_#{opt}" unless @opts[opt]
-            end
+        class << self
 
-            # Verify that all the options are correct
-            @interaction.list "Your settings :", :yellow, [
-                "Site name: #{@opts[:site_name]}",
-                "Site location: #{@opts[:site_location]}",
-                "Starter theme: #{@opts[:site_starter_theme]}",
-                "Development location: #{@opts[:site_dev_location]}",
-                "Development url: http://#{@opts[:site_dev_url]}",
-                "Initialized repository: #{@opts[:site_repository]}",
-                "Database host: #{@opts[:site_db_host]}",
-                "Database name: #{@opts[:site_db_name]}",
-                "Database username: #{@opts[:site_db_user]}",
-                "Database password: #{@opts[:site_db_pass]}"
-            ]
-
-            unless @interaction.agree? "Do the options above look correct?"
-                @interaction.error "Dang typos... aborting mission."
-            end
+            #
+            # Set up needed site options
+            #
+            # @param {Hash} opts
+            #
+            # @return {Hash}
+            #
+            def setup_site_options(opts = {})
+                @opts = opts
 
-            @opts
-        end
+                if @environment.yolo
+                    @opts[:use_defaults] = true
+                end
 
-        private
-
-        #
-        # Site name
-        #
-        # @return {String}
-        #
-        def setup_site_name
-            if @environment.yolo
-                name = Faker::Company.bs.split(" ").sample.downcase
-            else
-                name = @interaction.prompt "What's the site name? (letters, numbers and dashes only)"
+                @opts[:site_name]          ||= setup_site_name
+                @opts[:site_name_clean]    ||= setup_site_name_clean
+                @opts[:site_location]      ||= setup_site_location
+                @opts[:site_starter_theme] ||= setup_site_starter_theme
+                @opts[:site_dev_location]  ||= setup_site_dev_location
+                @opts[:site_dev_url]       ||= setup_site_dev_url
+                @opts[:site_repository]    ||= setup_site_repository
+                @opts[:site_db_host]       ||= setup_site_db_host
+                @opts[:site_db_name]       ||= setup_site_db_name
+                @opts[:site_db_user]       ||= setup_site_db_user
+                @opts[:site_db_pass]       ||= setup_site_db_pass
+
+                # Verify that all the options are correct
+                @interaction.list "Your settings :", :yellow, [
+                    "Site name: #{@opts[:site_name]}",
+                    "Site location: #{@opts[:site_location]}",
+                    "Starter theme: #{@opts[:site_starter_theme]}",
+                    "Development location: #{@opts[:site_dev_location]}",
+                    "Development url: http://#{@opts[:site_dev_url]}",
+                    "Initialized repository: #{@opts[:site_repository]}",
+                    "Database host: #{@opts[:site_db_host]}",
+                    "Database name: #{@opts[:site_db_name]}",
+                    "Database username: #{@opts[:site_db_user]}",
+                    "Database password: #{@opts[:site_db_pass]}"
+                ]
+
+                unless @interaction.agree? "Do the options above look correct?"
+                    @interaction.error "Dang typos... aborting mission."
+                end
+
+                @opts
             end
 
-            validate_site_name name
+            private
 
-            name
-        end
+            #
+            # Site name
+            #
+            # @return {String}
+            #
+            def setup_site_name
+                if @environment.yolo
+                    name = Faker::Company.bs.split(" ").sample.downcase
+                else
+                    name = @interaction.prompt "What's the site name? (letters, numbers and dashes only)"
+                end
 
-        #
-        # Clean site name
-        #
-        # @return {String}
-        #
-        def setup_site_name_clean
-            "#{@opts[:site_name]}".gsub(/[^\w]/, "_")[0..10]
-        end
+                validate_site_name name
 
-        #
-        # Site local location
-        #
-        # @return {String}
-        #
-        def setup_site_location
-            path = "#{Dir.pwd}/"
-
-            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)
+                name
             end
 
-            location
-        end
+            #
+            # Clean site name for database naming
+            #
+            # @return {String}
+            #
+            def setup_site_name_clean
+                "#{@opts[:site_name]}".gsub(/[^\w]/, "_")[0..10]
+            end
 
-        #
-        # Site starter theme
-        #
-        # @return {String}
-        #
-        def setup_site_starter_theme
-            if @opts[:site_bare]
-                theme = false
-            else
-                themes = {
-                    "theme-juice/theme-juice-starter" => "https://github.com/ezekg/theme-juice-starter.git",
-                    "other" => nil,
-                    "none"  => false
-                }
+            #
+            # Site local location
+            #
+            # @return {String}
+            #
+            def setup_site_location
+                path = "#{Dir.pwd}/"
 
                 if @opts[:use_defaults]
-                    return themes["theme-juice/theme-juice-starter"]
+                    location = File.expand_path(path)
+                else
+                    location = File.expand_path(@interaction.prompt "Where do you want to setup the site?", :default => path, :path => true)
                 end
 
-                choice = @interaction.choose "Which starter theme would you like to use?", :blue, themes.keys
+                location
+            end
 
-                case choice
-                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 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
+            #
+            # Site starter theme
+            #
+            # @return {String}
+            #
+            def setup_site_starter_theme
+                if @opts[:site_bare]
+                    theme = false
+                else
+                    themes = {
+                        "theme-juice/theme-juice-starter" => "https://github.com/ezekg/theme-juice-starter.git",
+                        "other" => nil,
+                        "none"  => false
+                    }
+
+                    if @opts[:use_defaults]
+                        return themes["theme-juice/theme-juice-starter"]
+                    end
+
+                    choice = @interaction.choose "Which starter theme would you like to use?", :blue, themes.keys
+
+                    case choice
+                    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 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
+                    end
+
+                    theme = themes[choice]
                 end
 
-                theme = themes[choice]
+                theme
             end
 
-            theme
-        end
-
-        #
-        # Site development location
-        #
-        # @return {String}
-        #
-        def setup_site_dev_location
-            dev_location = File.expand_path("#{@environment.vvv_path}/www/tj-#{@opts[:site_name]}")
-        end
-
-        #
-        # Site development url
-        #
-        # @return {String}
-        #
-        def setup_site_dev_url
-            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"
+            #
+            # Site development location
+            #
+            # @return {String}
+            #
+            def setup_site_dev_location
+                dev_location = File.expand_path("#{@environment.vvv_path}/www/tj-#{@opts[:site_name]}")
             end
 
-            validate_site_dev_url url
-
-            url
-        end
-
-        #
-        # Site repository
-        #
-        # @return {String}
-        #
-        def setup_site_repository
-            if @opts[:use_defaults] || @opts[:skip_repo]
-                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
+            #
+            # Site development url
+            #
+            # @return {String}
+            #
+            def setup_site_dev_url
+                if @opts[:use_defaults]
+                    url = "#{@opts[:site_name]}.dev"
                 else
-                    repo = false
+                    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
+
+                url
             end
 
-            repo
-        end
+            #
+            # Site repository
+            #
+            # @return {String}
+            #
+            def setup_site_repository
+                if @opts[:use_defaults] || @opts[:skip_repo]
+                    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
+                    else
+                        repo = false
+                    end
+                end
 
-        #
-        # Database host
-        #
-        # @return {String}
-        #
-        def setup_site_db_host
-            if @opts[:use_defaults] || @opts[:skip_db]
-                db_host = "vvv"
-            else
-                db_host = @interaction.prompt "Database host", :default => "vvv"
+                repo
             end
 
-            db_host
-        end
+            #
+            # Database host
+            #
+            # @return {String}
+            #
+            def setup_site_db_host
+                if @opts[:use_defaults] || @opts[:skip_db]
+                    db_host = "vvv"
+                else
+                    db_host = @interaction.prompt "Database host", :default => "vvv"
+                end
 
-        #
-        # Database name
-        #
-        # @return {String}
-        #
-        def setup_site_db_name
-            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_host
             end
 
-            db_name
-        end
+            #
+            # Database name
+            #
+            # @return {String}
+            #
+            def setup_site_db_name
+                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"
+                end
 
-        #
-        # Database username
-        #
-        # @return {String}
-        #
-        def setup_site_db_user
-            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_name
             end
 
-            db_user
-        end
+            #
+            # Database username
+            #
+            # @return {String}
+            #
+            def setup_site_db_user
+                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"
+                end
 
-        #
-        # Database password
-        #
-        # @return {String}
-        #
-        def setup_site_db_pass
-            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_user
             end
 
-            db_pass
-        end
+            #
+            # Database password
+            #
+            # @return {String}
+            #
+            def setup_site_db_pass
+                pass = Faker::Internet.password 24
+
+                if @opts[:use_defaults] || @opts[:skip_db]
+                    db_pass = pass
+                else
+                    db_pass = @interaction.prompt "Database password", :default => pass
+                end
 
-        #
-        # Validate site name
-        #
-        # @param {String} name
-        #
-        # @return {Void}
-        #
-        def validate_site_name(name)
-            if name.empty?
-                @interaction.error "Site name '#{name}' is invalid or empty. Aborting mission."
+                db_pass
             end
 
-            "#{name}".match /[^0-9A-Za-z.\-]/ do |char|
-                @interaction.error "Site name contains an invalid character '#{char}'. This name is used for creating directories, so that's not gonna work. Aborting mission."
+            #
+            # Validate site name
+            #
+            # @param {String} name
+            #
+            # @return {Void}
+            #
+            def validate_site_name(name)
+                if name.empty?
+                    @interaction.error "Site name '#{name}' is invalid or empty. Aborting mission."
+                end
+
+                "#{name}".match /[^0-9A-Za-z.\-]/ do |char|
+                    @interaction.error "Site name contains an invalid character '#{char}'. This name is used for creating directories, so that's not gonna work. Aborting mission."
+                end
             end
-        end
 
-        #
-        # Validate site url
-        #
-        # @param {String} url
-        #
-        # @return {Void}
-        #
-        def validate_site_dev_url(url)
-            unless "#{url}".match /(.dev)$/
-                @interaction.error "Your development url '#{url}' doesn't end with '.dev'. This is used internally by Landrush, so that's not gonna work. Aborting mission."
+            #
+            # Validate site url
+            #
+            # @param {String} url
+            #
+            # @return {Void}
+            #
+            def validate_site_dev_url(url)
+                unless "#{url}".match /(.dev)$/
+                    @interaction.error "Your development url '#{url}' doesn't end with '.dev'. This is used internally by Landrush, so that's not gonna work. Aborting mission."
+                end
             end
         end
     end

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

@@ -1,58 +1,48 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class Interaction::Delete
-
-        #
-        # Set up interactions and environment
-        #
-        # @return {Void}
-        #
-        def initialize
-            @environment = ::ThemeJuice::Environment
-            @interaction = ::ThemeJuice::Interaction
-        end
+    module Interaction::Delete
 
-        #
-        # Get needed site options
-        #
-        # @param {Hash} opts
-        #
-        # @return {Hash}
-        #
-        def get_site_options(opts = {})
-            @opts = opts
-
-            required_opts = [
-                :site_name,
-                :site_dev_location
-            ]
-
-            required_opts.each do |opt|
-                @opts[opt] = self.send "get_#{opt}" unless @opts[opt]
-            end
+        @environment = ::ThemeJuice::Environment
+        @interaction = ::ThemeJuice::Interaction
 
-            @opts
-        end
+        class << self
 
-        private
+            #
+            # Get needed site options
+            #
+            # @param {Hash} opts
+            #
+            # @return {Hash}
+            #
+            def get_site_options(opts = {})
+                @opts = opts
 
-        #
-        # Site name
-        #
-        # @return {String}
-        #
-        def get_site_name
-            name = @interaction.choose "Which site would you like to delete?", :red, ::ThemeJuice::Service::List.new.get_sites
-        end
+                @opts[:site_name]         ||= get_site_name
+                @opts[:site_dev_location] ||= get_site_dev_location
+
+                @opts
+            end
+
+            private
 
-        #
-        # Site development location
-        #
-        # @return {String}
-        #
-        def get_site_dev_location
-            dev_location = File.expand_path("#{@environment.vvv_path}/www/tj-#{@opts[:site_name]}")
+            #
+            # Site name
+            #
+            # @return {String}
+            #
+            def get_site_name
+                name = @interaction.choose "Which site would you like to delete?", :red, ::ThemeJuice::Service::List.new.get_sites
+            end
+
+            #
+            # Site development location
+            #
+            # @return {String}
+            #
+            def get_site_dev_location
+                dev_location = File.expand_path("#{@environment.vvv_path}/www/tj-#{@opts[:site_name]}")
+            end
         end
     end
 end

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

@@ -3,14 +3,10 @@
 module ThemeJuice
     class Interaction::TeeJay
 
-        #
-        # Set up interactions and environment
-        #
-        # @return {Void}
-        #
-        def initialize
-            @environment = ::ThemeJuice::Environment
-            @interaction = ::ThemeJuice::Interaction
+        @environment = ::ThemeJuice::Environment
+        @interaction = ::ThemeJuice::Interaction
+
+        class << self
         end
     end
 end

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

@@ -7,8 +7,7 @@ module ThemeJuice
         # @param {Hash} opts
         #
         def initialize(opts = {})
-            opts = ::ThemeJuice::Interaction::Create.new.setup_site_options(opts)
-
+            opts = ::ThemeJuice::Interaction::Create.setup_site_options(opts)
             super
         end
 
@@ -60,13 +59,14 @@ module ThemeJuice
                             "Database password: #{@opts[:site_db_pass]}"
                         ]
 
-                        unless OS.windows?
-                            @interaction.notice "Do you want to open up your new site 'http://#{@opts[:site_dev_url]}' now? (y/N)"
+                        @interaction.speak "Do you want to open up your new site 'http://#{@opts[:site_dev_url]}' now? (y/N)", {
+                            :color => [:black, :on_blue],
+                            :icon  => :restart,
+                            :row   => true
+                        }
 
-                            run ["open http://#{@opts[:site_dev_url]}"] if @interaction.agree? "", {
-                                :color  => :yellow,
-                                :simple => true
-                            }
+                        if @interaction.agree? "", { :simple => true }
+                            run ["open http://#{@opts[:site_dev_url]}"]
                         end
                     end
                 else
@@ -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

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

@@ -7,8 +7,7 @@ module ThemeJuice
         # @param {Hash} opts
         #
         def initialize(opts)
-            opts = ThemeJuice::Interaction::Delete.new.get_site_options(opts)
-
+            opts = ThemeJuice::Interaction::Delete.get_site_options(opts)
             super
         end
 

data/lib/theme-juice/version.rb

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

data/lib/theme-juice.rb

@@ -6,7 +6,6 @@ require "fileutils"
 require "pathname"
 require "tempfile"
 require "yaml"
-require "os"
 
 module ThemeJuice
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker