marv 0.6.5 → 0.7.0

data/lib/marv/server/server.rb

@@ -16,7 +16,7 @@ module Marv
         @name = dir
         @path = server_path
         @config_file = config_file
-        @options = server_options
+        @options = {}
         @config = server_config
         @host = server_host
         @port = server_port
@@ -26,6 +26,11 @@ module Marv
         @global.clean_broken_links(server_projects_paths)
       end
 
+      # Server exists
+      def exists?
+        ::File.exists?(server_path)
+      end
+
       # Server path
       def server_path
       	::File.join(@global.servers_path, @name)
@@ -98,8 +103,8 @@ module Marv
         options = {}
 
         unless ::File.exists?(@config_file)
-          @task.say "This will create a new development server.", :cyan
-          @task.say "Please enter server settings below."
+          @task.say_info "This will create a new development server."
+          @task.say_warning "Please enter server settings below:"
 
           options.merge!(ask_server_details)
           options.merge!(ask_database_details)
@@ -112,8 +117,8 @@ module Marv
       # Server details
       def ask_server_details
         options = {}
-        options[:server_host] = @task.ask "Where do you want to run the server?", :default => @global.config[:server_host]
-        options[:server_port] = @task.ask "Which port do you want to use?", :default => @global.config[:server_port]
+        options[:server_host] = @task.ask_input "Where do you want to run the server?", :default => @global.config[:server_host]
+        options[:server_port] = @task.ask_input "Which port do you want to use?", :default => @global.config[:server_port]
 
         return options
       end
@@ -121,10 +126,10 @@ module Marv
       # Database details
       def ask_database_details
         options = {}
-        options[:db_user] = @task.ask "MySQL database username?", :default => @global.config[:db_user]
-        options[:db_password] = @task.ask "MySQL database password?", :default => @global.config[:db_password]
-        options[:db_host] = @task.ask "MySQL database host?", :default => @global.config[:db_host]
-        options[:db_port] = @task.ask "MySQL database port?", :default => @global.config[:db_port]
+        options[:db_user] = @task.ask_input "MySQL database username:", :default => @global.config[:db_user]
+        options[:db_password] = @task.ask_input "MySQL database password:", :default => @global.config[:db_password]
+        options[:db_host] = @task.ask_input "MySQL database host:", :default => @global.config[:db_host]
+        options[:db_port] = @task.ask_input "MySQL database port:", :default => @global.config[:db_port]
 
         return options
       end
@@ -132,14 +137,19 @@ module Marv
       # Wordpress details
       def ask_wordpress_details
         options = {}
-        options[:wp_version] = @task.ask "WordPress version to install?", :default => @global.config[:wp_version]
+        options[:wp_version] = @task.ask_input "WordPress version to install:", :default => @global.config[:wp_version]
 
         return options
       end
 
       # Server database
       def db_client
-        ::Mysql2::Client.new(:host => db_host, :port => db_port, :username => db_user, :password => db_password)
+        begin
+          ::Mysql2::Client.new(:host => db_host, :port => db_port, :username => db_user, :password => db_password)
+        rescue Mysql2::Error::ConnectionError
+          @task.say_error "Not able to connect to the database.", "Start the database if it is not running.", false
+          abort
+        end
       end
 
       # MySQL create database
@@ -154,12 +164,12 @@ module Marv
 
       # MySQL grant all privileges
       def db_client_grant_all
-        @database.query("GRANT ALL PRIVILEGES ON #{db_name}.* TO '#{@db_user}'@'#{db_host}'")
+        @database.query("GRANT ALL PRIVILEGES ON #{db_name}.* TO '#{db_user}'@'#{db_host}'")
       end
 
       # MySQL revoke all privileges
       def db_client_revoke_all
-        @database.query("REVOKE ALL PRIVILEGES ON #{db_name}.* FROM '#{@db_user}'@'#{db_host}'")
+        @database.query("REVOKE ALL PRIVILEGES ON #{db_name}.* FROM '#{db_user}'@'#{db_host}'")
       end
 
       # MySQL flush privileges
@@ -175,8 +185,7 @@ module Marv
           db_client_flush_priv
           @database.close
         rescue Exception => e
-          @task.say "An error occured while creating database", :red
-          @task.say e.message
+          @task.say_error "An error occured while creating the database:", e.message, false, true
         end
       end
 
@@ -188,8 +197,7 @@ module Marv
           db_client_flush_priv
           @database.close
         rescue Exception => e
-          @task.say "An error occured while removing database", :red
-          @task.say e.message
+          @task.say_error "An error occured while removing the database:", e.message, false, true
         end
       end
 
@@ -208,4 +216,4 @@ module Marv
 
     end
   end
-end
+end

data/lib/marv/version.rb

@@ -0,0 +1,3 @@
+module Marv
+  VERSION = "0.7.0"
+end

metadata

@@ -1,36 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonian Guveli
 - Olibia Tsati
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.9'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.9'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -158,19 +158,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -191,75 +191,94 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '9.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '9.3'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.3'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: A toolkit for bootstrapping and developing WordPress themes and plugins
   using Sass, LESS, and CoffeeScript.
-email: info@hardpixel.eu
+email:
+- info@hardpixel.eu
 executables:
 - marv
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- ".document"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
-- bin/marv
+- bin/console
+- bin/setup
+- exe/marv
 - layouts/config/global.rb
 - layouts/config/project.rb
 - layouts/config/router.php
@@ -301,6 +320,7 @@ files:
 - layouts/theme/templates/single.php
 - lib/marv.rb
 - lib/marv/cli.rb
+- lib/marv/cli/base.rb
 - lib/marv/cli/project.rb
 - lib/marv/cli/server.rb
 - lib/marv/global.rb
@@ -313,15 +333,19 @@ files:
 - lib/marv/project/create.rb
 - lib/marv/project/guard.rb
 - lib/marv/project/guard/assets.rb
+- lib/marv/project/guard/commander.rb
 - lib/marv/project/guard/config.rb
 - lib/marv/project/guard/functions.rb
+- lib/marv/project/guard/pry.rb
 - lib/marv/project/guard/templates.rb
 - lib/marv/project/project.rb
 - lib/marv/server/actions.rb
 - lib/marv/server/create.rb
 - lib/marv/server/server.rb
-- marv.gemspec
-homepage: http://hardpixel.github.io/marv
+- lib/marv/version.rb
+- pkg/marv-0.6.5.gem
+- pkg/marv-0.7.0.gem
+homepage: https://hardpixel.github.io/marv
 licenses:
 - MIT
 metadata: {}
@@ -341,8 +365,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: A command-line tool for developing wordpress themes and plugins
+summary: Toolkit for developing WordPress themes and plugins
 test_files: []

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/VERSION

@@ -1 +0,0 @@
-0.6.5

data/marv.gemspec

@@ -1,156 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: marv 0.6.5 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "marv".freeze
-  s.version = "0.6.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Jonian Guveli".freeze, "Olibia Tsati".freeze]
-  s.date = "2018-01-11"
-  s.description = "A toolkit for bootstrapping and developing WordPress themes and plugins using Sass, LESS, and CoffeeScript.".freeze
-  s.email = "info@hardpixel.eu".freeze
-  s.executables = ["marv".freeze]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "CHANGELOG.md",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/marv",
-    "layouts/config/global.rb",
-    "layouts/config/project.rb",
-    "layouts/config/router.php",
-    "layouts/config/server.rb",
-    "layouts/config/wp-config.php",
-    "layouts/plugin/assets/images/screenshot.png",
-    "layouts/plugin/assets/javascripts/admin.coffee",
-    "layouts/plugin/assets/javascripts/admin.js",
-    "layouts/plugin/assets/javascripts/plugin.coffee",
-    "layouts/plugin/assets/javascripts/plugin.js",
-    "layouts/plugin/assets/stylesheets/plugin.scss",
-    "layouts/plugin/functions/plugin.php",
-    "layouts/theme/assets/images/screenshot.png",
-    "layouts/theme/assets/javascripts/admin.coffee",
-    "layouts/theme/assets/javascripts/admin.js",
-    "layouts/theme/assets/javascripts/theme.coffee",
-    "layouts/theme/assets/javascripts/theme.js",
-    "layouts/theme/assets/stylesheets/_header.scss",
-    "layouts/theme/assets/stylesheets/style.scss",
-    "layouts/theme/functions/functions.php",
-    "layouts/theme/includes/filters-admin.php",
-    "layouts/theme/includes/filters.php",
-    "layouts/theme/includes/helpers.php",
-    "layouts/theme/templates/footer.php",
-    "layouts/theme/templates/header.php",
-    "layouts/theme/templates/index.php",
-    "layouts/theme/templates/page.php",
-    "layouts/theme/templates/pages/404.php",
-    "layouts/theme/templates/pages/archive.php",
-    "layouts/theme/templates/pages/author.php",
-    "layouts/theme/templates/pages/search.php",
-    "layouts/theme/templates/partials/comments.php",
-    "layouts/theme/templates/partials/content-none.php",
-    "layouts/theme/templates/partials/content-page.php",
-    "layouts/theme/templates/partials/content-single.php",
-    "layouts/theme/templates/partials/content.php",
-    "layouts/theme/templates/partials/searchform.php",
-    "layouts/theme/templates/partials/sidebar.php",
-    "layouts/theme/templates/single.php",
-    "lib/marv.rb",
-    "lib/marv/cli.rb",
-    "lib/marv/cli/project.rb",
-    "lib/marv/cli/server.rb",
-    "lib/marv/global.rb",
-    "lib/marv/project/actions.rb",
-    "lib/marv/project/builder.rb",
-    "lib/marv/project/builder/assets.rb",
-    "lib/marv/project/builder/engines.rb",
-    "lib/marv/project/builder/functions.rb",
-    "lib/marv/project/builder/templates.rb",
-    "lib/marv/project/create.rb",
-    "lib/marv/project/guard.rb",
-    "lib/marv/project/guard/assets.rb",
-    "lib/marv/project/guard/config.rb",
-    "lib/marv/project/guard/functions.rb",
-    "lib/marv/project/guard/templates.rb",
-    "lib/marv/project/project.rb",
-    "lib/marv/server/actions.rb",
-    "lib/marv/server/create.rb",
-    "lib/marv/server/server.rb",
-    "marv.gemspec"
-  ]
-  s.homepage = "http://hardpixel.github.io/marv".freeze
-  s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.3".freeze
-  s.summary = "A command-line tool for developing wordpress themes and plugins".freeze
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<guard>.freeze, ["< 2.9", "~> 2.8"])
-      s.add_runtime_dependency(%q<guard-livereload>.freeze, ["~> 2.4"])
-      s.add_runtime_dependency(%q<thor>.freeze, ["~> 0.19"])
-      s.add_runtime_dependency(%q<sprockets>.freeze, ["~> 2.12"])
-      s.add_runtime_dependency(%q<childprocess>.freeze, ["~> 0.5"])
-      s.add_runtime_dependency(%q<mysql2>.freeze, ["~> 0.3"])
-      s.add_runtime_dependency(%q<uglifier>.freeze, ["~> 2.7"])
-      s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.4"])
-      s.add_runtime_dependency(%q<less>.freeze, ["~> 2.6"])
-      s.add_runtime_dependency(%q<coffee-script>.freeze, ["~> 2.3"])
-      s.add_runtime_dependency(%q<therubyracer>.freeze, ["~> 0.12"])
-      s.add_runtime_dependency(%q<rubyzip>.freeze, ["~> 1.1"])
-      s.add_runtime_dependency(%q<autoprefixer-rails>.freeze, ["~> 7.2"])
-      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<guard>.freeze, ["< 2.9", "~> 2.8"])
-      s.add_dependency(%q<guard-livereload>.freeze, ["~> 2.4"])
-      s.add_dependency(%q<thor>.freeze, ["~> 0.19"])
-      s.add_dependency(%q<sprockets>.freeze, ["~> 2.12"])
-      s.add_dependency(%q<childprocess>.freeze, ["~> 0.5"])
-      s.add_dependency(%q<mysql2>.freeze, ["~> 0.3"])
-      s.add_dependency(%q<uglifier>.freeze, ["~> 2.7"])
-      s.add_dependency(%q<sass>.freeze, ["~> 3.4"])
-      s.add_dependency(%q<less>.freeze, ["~> 2.6"])
-      s.add_dependency(%q<coffee-script>.freeze, ["~> 2.3"])
-      s.add_dependency(%q<therubyracer>.freeze, ["~> 0.12"])
-      s.add_dependency(%q<rubyzip>.freeze, ["~> 1.1"])
-      s.add_dependency(%q<autoprefixer-rails>.freeze, ["~> 7.2"])
-      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<guard>.freeze, ["< 2.9", "~> 2.8"])
-    s.add_dependency(%q<guard-livereload>.freeze, ["~> 2.4"])
-    s.add_dependency(%q<thor>.freeze, ["~> 0.19"])
-    s.add_dependency(%q<sprockets>.freeze, ["~> 2.12"])
-    s.add_dependency(%q<childprocess>.freeze, ["~> 0.5"])
-    s.add_dependency(%q<mysql2>.freeze, ["~> 0.3"])
-    s.add_dependency(%q<uglifier>.freeze, ["~> 2.7"])
-    s.add_dependency(%q<sass>.freeze, ["~> 3.4"])
-    s.add_dependency(%q<less>.freeze, ["~> 2.6"])
-    s.add_dependency(%q<coffee-script>.freeze, ["~> 2.3"])
-    s.add_dependency(%q<therubyracer>.freeze, ["~> 0.12"])
-    s.add_dependency(%q<rubyzip>.freeze, ["~> 1.1"])
-    s.add_dependency(%q<autoprefixer-rails>.freeze, ["~> 7.2"])
-    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
-    s.add_dependency(%q<bundler>.freeze, [">= 0"])
-    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-  end
-end
-