marv 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f87af99f31d79f72bb5742d583dcb6e090580aa5eefb3fd7486179cf1cfe31
-  data.tar.gz: c5fc4ec9e6c14901358d97a305b4d2c99c3db358f8806f6488a83d6c81518d50
+  metadata.gz: 8a1ef1b62b59fe9ad5e2e7e30c4cfba2374691f1f92c5d0ec9fc306af4813a27
+  data.tar.gz: 6b7244651f5e6b802d9380455e03490e1afa81c13b3dd8297c5ac2f586bf3e87
 SHA512:
-  metadata.gz: e3236f7f405fbd3398002f3c012a699cc50bf6f63fc94b791a66fce055f14dce1d0f3ff7185365dc62763c17492446840ba0950acec4ad59e4b217018412302b
-  data.tar.gz: a8e117675329a0013c5617ad637ec7abc4feea87ffe5c35510998f8c93a61142a4b58706f2dd1297f6258472704d6f96796c3997a350a23ca91d2e2ace7f98ac
+  metadata.gz: 4adc2ca6a4cdd4c15150978a8f63e6afa129d1d6afc58cf98245e6517f3201e241f8653977011624d8a2856dd66df13746d8df94521cdd86e68c3fd77f6e6433
+  data.tar.gz: c09d515a03593a71d5006d16f05f089b94b75191b95f2af3b9def9ac949ef24c01549c2cb933ac327ed5df69c63b91a615b24594d2cf5abcca53add33bba775d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.7.0
+* Bug fixes
+* Add hotel support
+* Optimize ui and messages
+
+## v0.6.5
+* Bug fixes
+* Add autoprefixer
+
 ## v0.6.4
 * Fix port availability check
 * Update gem dependencies
@@ -97,4 +106,4 @@
 * Fork from Forge (https://github.com/thethemefoundry/forge)
 * Update dependencies
 * Fix errors from old dependencies
-* Add extras folder
+* Add extras folder

data/Gemfile

@@ -1,23 +1,4 @@
-source 'http://rubygems.org'
-# Add dependencies required to use your gem here.
-gem 'guard', '~> 2.8', '< 2.9'
-gem 'guard-livereload', '~> 2.4'
-gem 'thor', '~> 0.19'
-gem 'sprockets', '~> 2.12'
-gem 'childprocess', '~> 0.5'
-gem 'mysql2', '~> 0.3'
-gem 'uglifier', '~> 2.7'
-gem 'sass', '~> 3.4'
-gem 'less', '~> 2.6'
-gem 'coffee-script', '~> 2.3'
-gem 'therubyracer', '~> 0.12'
-gem 'rubyzip', '~> 1.1'
-gem 'autoprefixer-rails', '~> 7.2'
+source "https://rubygems.org"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem 'rdoc'
-  gem 'bundler'
-  gem 'jeweler'
-end
+# Specify your gem's dependencies in marv.gemspec
+gemspec

data/Gemfile.lock

@@ -1,13 +1,30 @@
+PATH
+  remote: .
+  specs:
+    marv (0.7.0)
+      autoprefixer-rails (~> 9.3)
+      childprocess (~> 0.5)
+      coffee-script (~> 2.3)
+      guard (~> 2.8, < 2.9)
+      guard-livereload (~> 2.4)
+      less (~> 2.6)
+      mini_racer (~> 0.2)
+      mysql2 (~> 0.3)
+      rubyzip (~> 1.1)
+      sass (~> 3.4)
+      sprockets (~> 3.7)
+      thor (~> 0.19)
+      tilt (~> 1.1, != 1.3)
+      uglifier (~> 4.1)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
-    autoprefixer-rails (7.2.4)
+    autoprefixer-rails (9.3.1)
       execjs
-    builder (3.2.3)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
     coffee-script (2.4.1)
@@ -15,25 +32,15 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     commonjs (0.2.7)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
+    concurrent-ruby (1.1.3)
+    diff-lcs (1.3)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.5)
+    eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.9.25)
     formatador (0.2.5)
-    git (1.3.0)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
-      oauth2 (~> 1.0)
     guard (2.8.2)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -46,102 +53,66 @@ GEM
       guard (~> 2.8)
       guard-compat (~> 1.0)
       multi_json (~> 1.8)
-    hashie (3.5.7)
-    highline (1.7.10)
-    hike (1.2.3)
-    hitimes (1.2.6)
+    hitimes (1.3.0)
     http_parser.rb (0.6.0)
-    jeweler (2.3.7)
-      builder
-      bundler (>= 1)
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      psych (~> 2.2)
-      rake
-      rdoc
-      semver2
-    json (2.1.0)
-    jwt (1.5.6)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.19)
+    libv8 (6.7.288.46.1-x86_64-linux)
     listen (2.10.1)
       celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.12)
-    method_source (0.9.0)
-    mime-types (2.99.3)
-    mini_portile2 (2.3.0)
+    lumberjack (1.0.13)
+    method_source (0.9.2)
+    mini_racer (0.2.4)
+      libv8 (>= 6.3)
     multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    mysql2 (0.4.10)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    pry (0.11.3)
+    mysql2 (0.5.2)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    psych (2.2.4)
-    rack (1.6.8)
-    rake (12.3.0)
-    rb-fsevent (0.10.2)
+    rack (2.0.6)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rdoc (6.0.1)
-    ref (2.0.0)
-    rubyzip (1.2.1)
-    sass (3.5.5)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubyzip (1.2.2)
+    sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    semver2 (3.4.2)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
-    thor (0.20.0)
-    thread_safe (0.3.6)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    thor (0.20.3)
     tilt (1.4.1)
     timers (4.0.4)
       hitimes
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (4.1.20)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  autoprefixer-rails (~> 7.2)
-  bundler
-  childprocess (~> 0.5)
-  coffee-script (~> 2.3)
-  guard (~> 2.8, < 2.9)
-  guard-livereload (~> 2.4)
-  jeweler
-  less (~> 2.6)
-  mysql2 (~> 0.3)
-  rdoc
-  rubyzip (~> 1.1)
-  sass (~> 3.4)
-  sprockets (~> 2.12)
-  therubyracer (~> 0.12)
-  thor (~> 0.19)
-  uglifier (~> 2.7)
+  bundler (~> 1.15)
+  marv!
+  rake (~> 12.3)
+  rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

data/Rakefile

@@ -1,44 +1,6 @@
-# encoding: utf-8
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-require 'rubygems'
-require 'bundler'
+RSpec::Core::RakeTask.new(:spec)
 
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
-require 'jeweler'
-
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "marv"
-  gem.executables = ["marv"]
-  gem.homepage = "http://hardpixel.github.io/marv"
-  gem.license = "MIT"
-  gem.summary = %Q{A command-line tool for developing wordpress themes and plugins}
-  gem.description = %Q{A toolkit for bootstrapping and developing WordPress themes and plugins using Sass, LESS, and CoffeeScript.}
-  gem.email = "info@hardpixel.eu"
-  gem.authors = ["Jonian Guveli", "Olibia Tsati"]
-  # dependencies defined in Gemfile
-  gem.files.include Dir.glob('**/*')
-end
-
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rdoc/task'
-
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "marv #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('LICENSE*')
-  rdoc.rdoc_files.include('CHANGELOG*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "marv"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/{bin → exe}/marv

@@ -9,4 +9,9 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'marv'
 
-Marv::CLI::Commands.start
+at_exit do
+  Marv.exit_message
+end
+
+Marv.banner_message
+Marv::CLI::Commands.start

data/lib/marv.rb

@@ -2,17 +2,40 @@ require 'thor'
 require 'marv/cli'
 require 'marv/global'
 
+BANNER = <<-TEXT
+
+  ::::    ::::      :::     :::::::::  :::     :::
+  +:+:+: :+:+:+   :+: :+:   :+:    :+: :+:     :+:
+  +:+ +:+:+ +:+  +:+   +:+  +:+    +:+ +:+     +:+
+  +#+  +:+  +#+ +#++:++#++: +#++:++#:  +#+     +:+
+  +#+       +#+ +#+     +#+ +#+    +#+  +#+   +#+
+  #+#       #+# #+#     #+# #+#    #+#   #+#+#+#
+  ###       ### ###     ### ###    ###     ###
+
+TEXT
+
 module Marv
 
   def self.root
     ::File.expand_path(::File.join(::File.dirname(__FILE__), '..'))
   end
 
+  def self.banner_message
+    puts BANNER
+  end
+
+  def self.exit_message
+    time = ::Time.now.strftime('%T')
+    puts  "\n\n#{time} - INFO - Bye bye..."
+  end
+
+  def self.colorize(text, color)
+    @colorizer ||= Thor::Shell::Color.new
+    @colorizer.set_color(text, color)
+  end
+
 end
 
 trap 'SIGINT' do
-  puts
-  puts
-  puts ::Time.now.strftime('%T') + ' - INFO - Bye bye...'
   exit 130
 end

data/lib/marv/cli.rb

@@ -5,12 +5,19 @@ module Marv
   module CLI
     class Commands < Project
 
+      # Print version
+      desc "version", "Show version information"
+      map %w(--version -v) => :version
+      def version
+        require_relative "version"
+        puts "v#{Marv::VERSION}"
+      end
+
       # Configure marv
       desc "config", "Configure Marv projects and servers"
       long_desc "Creates a global config.rb file that can be used to auto-configure your projects and servers"
       def config
-        global = Marv::Global.new(self)
-        global.reconfigure
+        Marv::Global.new(self, true)
       end
 
       desc "server [SUBCOMMAND]", "Manage marv servers (create, start and more...)"
@@ -18,4 +25,4 @@ module Marv
 
     end
   end
-end
+end

data/lib/marv/cli/base.rb

@@ -0,0 +1,80 @@
+module Marv
+  module CLI
+    class Base < Thor
+
+      # Include action helpers
+      include Thor::Actions
+
+      # Set layouts root path
+      def self.source_root
+        ::File.expand_path(::File.join(Marv.root, 'layouts'))
+      end
+
+      no_commands do
+        # Print an empty message
+        def say_empty(lines=1)
+          (1..lines).each { self.say('') }
+        end
+
+        # Print general message
+        def say_message(text, space_below=true, space_above=false, color=nil)
+          self.say_empty if space_above
+          self.say("#{text}", color)
+          self.say_empty if space_below
+        end
+
+        # Print error message
+        def say_error(text, message=nil, space_below=true, space_above=false)
+          say_message(text, false, space_above, :red)
+          say_message(message, space_below, false) unless message.nil?
+        end
+
+        # Print info message
+        def say_info(text, space_below=false, space_above=false)
+          say_message(text, space_below, space_above, :cyan)
+        end
+
+        # Print warning message
+        def say_warning(text, space_below=true, space_above=false)
+          say_message(text, space_below, space_above, :yellow)
+        end
+
+        # Print success message
+        def say_success(text, space_below=true, space_above=false)
+          say_message(text, space_below, space_above, :green)
+        end
+
+        # Ask for user input
+        def ask_input(text, color=nil, *args)
+          self.ask("#{text}", color, *args)
+        end
+
+        # Ask for option value
+        def ask_option(text, color=nil, *args)
+          self.ask("  #{text}", color, *args)
+        end
+
+        # Ask to change options
+        def said_change?(text, *args)
+          self.yes?("» #{text}", :cyan, *args)
+        end
+
+        # Ask for yes answer
+        def said_yes?(text, *args)
+          self.yes?("#{text}", :cyan, *args)
+        end
+
+        # Ask for no answer
+        def said_no?(text, *args)
+          self.no?("#{text}", :yellow, *args)
+        end
+
+        # Check if executable exists
+        def exec_exixts?(name)
+          `which #{name}`.start_with?('/')
+        end
+      end
+
+    end
+  end
+end