wordless 1.1.5 → 2.2.0

data/Rakefile

@@ -1,7 +1,9 @@
-#!/usr/bin/env rake
-
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec
+
+RuboCop::RakeTask.new(:rubocop)
+task default: :rubocop

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rubocop

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/bin/setup.sh

@@ -13,16 +13,10 @@ function log {
 
 log "Deleting {$FIXTURE_PATH}..."
 rm -rf $FIXTURE_PATH
-mkdir $FIXTURE_PATH
+mkdir -p $FIXTURE_PATH
 echo "Done!"
 
 log "Downloading wordless from github..."
 cd $FIXTURE_PATH
 wget $WORDLESS_ARCHIVE -O - | tar -xz --strip 1
 echo "Done!"
-
-log "Customizing ruby and compass paths..."
-cp -f ../wordless_preferences.php $WORDLESS_PREFERENCES
-perl -p -i -e "s|<RUBY_PATH>|$(which ruby)|" $WORDLESS_PREFERENCES
-perl -p -i -e "s|<COMPASS_PATH>|$(which compass)|" $WORDLESS_PREFERENCES
-echo "Done!"

data/exe/wordless

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-lib = File.expand_path('../../lib', __FILE__)
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'wordless'

data/lib/wordless/cli.rb

@@ -9,39 +9,17 @@ module Wordless
       end
     end
 
-    desc "new [NAME]", "Download WordPress in specified directory, install the Wordless plugin and create a Wordless theme"
+    desc "new <NAME>", "Download WordPress in specified directory,
+                        install the Wordless plugin and create a Wordless theme"
     add_method_options(shared_options)
-    method_option :bare, type: :boolean, aliases: "-b", desc: "Remove default themes and plugins", default: true
+    method_option :bare,
+                  type: :boolean,
+                  aliases: "-b",
+                  desc: "Remove default themes and plugins",
+                  default: true
+
     def new(name)
       wordless_cli.start(name)
     end
-
-    desc "install", "Install the Wordless plugin into an existing WordPress installation"
-    def install
-      wordless_cli.install_wordless
-    end
-
-    desc "theme [NAME]", "Create a new Wordless theme NAME"
-    def theme(name)
-      wordless_cli.create_theme(name)
-    end
-
-    desc "compile", "Compile static assets"
-    def compile
-      wordless_cli.compile
-    end
-
-    desc "clean", "Clean static assets"
-    def clean
-      wordless_cli.clean
-    end
-
-    desc "deploy", "Deploy your WordPress site using the deploy_command defined in your Wordfile"
-    method_option :refresh, aliases: "-r", desc: "Compile static assets before deploying and clean them afterwards"
-    method_option :command, aliases: "-c", desc: "Use a custom deploy command"
-    def deploy
-      wordless_cli.deploy
-    end
   end
 end
-

data/lib/wordless/cli_helper.rb

@@ -3,11 +3,11 @@ module Wordless
     extend ActiveSupport::Concern
 
     included do
-      [ :say, :run ].each do |sym|
+      %i[say run].each do |sym|
         define_method sym do |*args|
           thor.send(sym, *args)
         end
-        private sym
+        private sym # rubocop:disable Style/AccessModifierDeclarations
       end
     end
 
@@ -51,7 +51,7 @@ module Wordless
     end
 
     def void
-      RbConfig::CONFIG['host_os'] =~ /msdos|mswin|djgpp|mingw/ ? 'NUL' : '/dev/null'
+      /msdos|mswin|djgpp|mingw/.match? RbConfig::CONFIG['host_os'] ? 'NUL' : '/dev/null'
     end
   end
 end

data/lib/wordless/version.rb

@@ -1,3 +1,3 @@
 module Wordless
-  VERSION = "1.1.5"
+  VERSION = "2.2.0".freeze
 end

data/lib/wordless/wordless_cli.rb

@@ -12,26 +12,48 @@ module Wordless
     end
 
     DEFAULT_PATHS = {
-      PATH::WORDFILE   => 'Wordfile',
+      PATH::WORDFILE => 'Wordfile',
       PATH::WP_CONTENT => 'wp-content',
-      PATH::PLUGINS    => 'wp-content/plugins',
-      PATH::THEMES     => 'wp-content/themes',
-    }
+      PATH::PLUGINS => 'wp-content/plugins',
+      PATH::THEMES => 'wp-content/themes'
+    }.freeze
+
+    GLOBAL_NODE_MODULES = %w[yarn].freeze
 
     def initialize(thor, options = {})
       @options = options
       @thor = thor
     end
 
-    def start(name)
+    def start(name) # rubocop:disable Metrics/MethodLength
+      install_global_node_modules
       install_wordpress_and_wp_cli(name)
 
       Dir.chdir(name)
 
       install_wordless
-      create_theme(name)
-      activate_theme(name)
+      create_and_activate_theme(name)
       set_permalinks
+
+      Dir.chdir("wp-content/themes/#{name}")
+
+      info('Activate the right node version using NVM')
+      if run_command('$SHELL -l -c "nvm use"')
+        info("Installing theme's node modules...")
+        run_command('$SHELL -l -c "nvm use && yarn setup"') ||
+          error("Problem installing theme's node modules")
+      else
+        warning(
+          'NVM or the required node version is not installed. ' \
+          'Will try to continue using global node.'
+        )
+        info("Installing theme's node modules...")
+        run_command("yarn setup") || error("Problem installing theme's node modules")
+      end
+
+      success("All done! Now yor're ready to use Wordless with following commands:")
+      info("`cd #{name}/wp-content/themes/#{name}`")
+      info("`yarn run server`")
     end
 
     def install_wordless
@@ -40,8 +62,9 @@ module Wordless
       info("Installing and activating plugin...")
 
       at_wordpress_root do
+        github_url = 'https://github.com/welaika/wordless/archive/master.zip'
         error("Directory '#{plugins_path}' not found.") unless File.directory?(plugins_path)
-        if run_command("wp plugin install wordless --activate")
+        if run_command("wp plugin install #{github_url} --activate")
           success("Done!")
         else
           error("There was an error installing and/or activating the Wordless plugin.")
@@ -49,61 +72,26 @@ module Wordless
       end
     end
 
-    def create_theme(name)
-      at_wordpress_root do
-        if File.directory?(themes_path)
-          if run_command("php #{File.join(lib_dir, 'theme_builder.php')} #{name}")
-            success("Created a new Wordless theme in '#{File.join(themes_path, name)}'.")
-          else
-            error("Couldn't create Wordless theme.")
-          end
-        else
-          error("Directory '#{themes_path}' not found.")
-        end
-      end
-    end
-
-    def compile
-      at_wordpress_root do
-        if system "php #{File.join(lib_dir, 'compile_assets.php')}"
-          success("Compiled static assets.")
-        else
-          error("Couldn't compile static assets.")
-        end
-      end
-    end
-
-    def clean
-      at_wordpress_root do
-        if File.directory?(themes_path)
-          static_css = Array(config[:static_css] || Dir['wp-content/themes/*/assets/stylesheets/screen.css'])
-          static_js = Array(config[:static_js] || Dir['wp-content/themes/*/assets/javascripts/application.js'])
+    def install_global_node_modules
+      info("Check for necessary global NPM packages")
+      which('npm') ||
+        error("Node isn't installed. Head to https://nodejs.org/en/download/package-manager")
 
-          (static_css + static_js).each do |file|
-            FileUtils.rm_f(file) if File.exist?(file)
-          end
+      global_node_modules = GLOBAL_NODE_MODULES.dup
 
-          success("Cleaned static assets.")
-        else
-          error("Directory '#{themes_path}' not found.")
-        end
+      global_node_modules.reject! do |m|
+        run_command("npm list -g #{m}")
       end
-    end
-
-    def deploy
-      at_wordpress_root do
-        compile if options['refresh']
 
-        deploy_command = options['command'].presence || config[:deploy_command]
-
-        if deploy_command
-          system("#{deploy_command}")
-        else
-          error("deploy_command not set. Make sure it is included in your Wordfile.")
-        end
+      if global_node_modules.empty?
+        success("Global NPM packages needed by Wordless already installed. Good job!")
+        return true
+      end
 
-        clean if options['refresh']
+      global_node_modules.each do |m|
+        run_command("npm install -g #{m}") && success("Installed NPM package #{m} globally")
       end
+      success("Done!")
     end
 
     private
@@ -115,11 +103,11 @@ module Wordless
     end
 
     def lib_dir
-      @@lib_dir ||= File.expand_path(File.dirname(__FILE__))
+      @lib_dir ||= __dir__
     end
 
     def wordpress_dir(current_dir = Dir.pwd)
-      @wordpress_dir ||= (
+      @wordpress_dir ||= begin
         current_dir = File.expand_path(current_dir)
 
         if File.exist?(File.join(current_dir, wp_content_path))
@@ -129,7 +117,7 @@ module Wordless
         else
           wordpress_dir(upper_dir(current_dir))
         end
-      )
+      end
     end
 
     def last_dir?(directory)
@@ -141,13 +129,13 @@ module Wordless
     end
 
     def config
-      @@config ||= (
+      @config ||= begin
         if File.exist?(wordfile_path)
-          YAML::load(File.open(wordfile_path)).symbolize_keys
+          YAML.safe_load(File.open(wordfile_path)).symbolize_keys
         else
           {}
         end
-      )
+      end
     end
 
     def at_wordpress_root
@@ -164,20 +152,33 @@ module Wordless
       WordPressTools::CLI.new.invoke('new', [name], options)
     end
 
-    def activate_theme(name)
+    def create_and_activate_theme(name)
       at_wordpress_root do
         info("Activating theme...")
-        run_command("wp theme activate #{name}") || error("Cannot activate theme '#{name}'")
+        run_command("wp wordless theme create #{name}") || error("Cannot activate theme '#{name}'")
         success("Done!")
       end
     end
 
     def set_permalinks
       at_wordpress_root do
-        info("Setting permalinks for wordless...")
-        run_command("wp rewrite structure /%postname%/") || error("Cannot set permalinks")
+        info("Setting permalinks...")
+        run_command('wp rewrite structure /%postname%/') || error("Cannot set permalinks")
         success("Done!")
       end
     end
+
+    def which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+
+      nil
+    end
   end
 end

data/wordless.gemspec

@@ -1,36 +1,41 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "wordless/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "wordless"
   spec.version       = Wordless::VERSION
-  spec.authors       = ["Étienne Després", "Alessandro Fazzi", "Filippo Gangi Dino", "Ju Liu", "Fabrizio Monti"]
-  spec.email         = ["etienne@molotov.ca", "alessandro.fazzi@welaika.com", "filippo.gangidino@welaika.com", "ju.liu@welaika.com", "fabrizio.monti@welaika.com"]
-  spec.summary       = %q{Manage Wordless themes.}
-  spec.description   = %q{Command line tool to manage Wordless themes.}
+  spec.authors       = ["Étienne Després", "Alessandro Fazzi",
+                        "Filippo Gangi Dino", "Ju Liu", "Fabrizio Monti"]
+  spec.email         = ["etienne@molotov.ca",
+                        "alessandro.fazzi@welaika.com",
+                        "filippo.gangidino@welaika.com",
+                        "ju.liu@welaika.com",
+                        "fabrizio.monti@welaika.com"]
+  spec.summary       = 'Manage Wordless themes.'
+  spec.description   = 'The quickest CLI tool to setup a new WordPress locally. Wordless ready.'
   spec.homepage      = "http://github.com/welaika/wordless_gem"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         =  `git ls-files -z`
+                        .split("\x0")
+                        .reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.1.2"
+  spec.required_ruby_version = ">= 2.4.1"
 
-  spec.add_dependency "thor", "~> 0.19.1"
   spec.add_dependency "activesupport"
-  spec.add_dependency "sprockets"
-  spec.add_dependency "compass"
-  spec.add_dependency "coffee-script"
-  spec.add_dependency "yui-compressor"
-  spec.add_dependency "wordpress_tools", "~> 1.2.0"
+  spec.add_dependency "thor", "~> 0.19.1"
+  spec.add_dependency "wordpress_tools", "~> 1.4.1"
 
-  spec.add_development_dependency "rspec", "~> 3.2.0"
-  spec.add_development_dependency "pry-byebug", "~> 3.0"
-  spec.add_development_dependency "priscilla", "~> 1.0"
-  spec.add_development_dependency "gem-release"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "debase"
+  spec.add_development_dependency "pry-byebug", "~> 3.9"
+  spec.add_development_dependency "rake", "~> 13.0.1"
+  spec.add_development_dependency "rspec", "~> 3.9.0"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "ruby-debug-ide"
+  spec.add_development_dependency "solargraph"
 end
-

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: wordless
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 2.2.0
 platform: ruby
 authors:
-- "Étienne Després"
+- Étienne Després
 - Alessandro Fazzi
 - Filippo Gangi Dino
 - Ju Liu
 - Fabrizio Monti
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: wordpress_tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
-  name: compass
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -71,13 +71,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-script
+  name: debase
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -85,77 +85,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yui-compressor
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '3.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: wordpress_tools
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
+        version: 13.0.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: priscilla
+  name: ruby-debug-ide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -168,7 +168,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Command line tool to manage Wordless themes.
+description: The quickest CLI tool to setup a new WordPress locally. Wordless ready.
 email:
 - etienne@molotov.ca
 - alessandro.fazzi@welaika.com
@@ -182,31 +182,33 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
+- ".rubocop.yml"
 - ".ruby-version"
+- ".vscode/launch.json"
+- ".vscode/settings.json"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.mdown
 - Rakefile
 - assets/images/wordless_gem.png
 - bin/autospec
+- bin/rake
 - bin/rspec
+- bin/rubocop
 - bin/setup.sh
 - exe/wordless
 - lib/wordless.rb
 - lib/wordless/cli.rb
 - lib/wordless/cli_helper.rb
-- lib/wordless/compile_assets.php
-- lib/wordless/theme_builder.php
 - lib/wordless/version.rb
-- lib/wordless/wordless_bridge.php
 - lib/wordless/wordless_cli.rb
 - wordless.gemspec
 homepage: http://github.com/welaika/wordless_gem
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,16 +216,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.11
+signing_key:
 specification_version: 4
 summary: Manage Wordless themes.
 test_files: []