wordless 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b40aab8fcbc792a7f412619b33593ee6477724f
-  data.tar.gz: 08451c440d780863cf12d77a944cf52a3c84a0e2
+  metadata.gz: cdfb87db26ed86aa7c9eba8af20a05b43420779b
+  data.tar.gz: a5e1d58e1574feab7a0cb906093fb4178f36bab1
 SHA512:
-  metadata.gz: b73dd76cd25890160cba93bbb9b62e36a1ce39c19a7004c02fda4ec0c126b76a2f7b5fdf8f85d5d8433ecb16f3e51788232b246c64c9c5865ce78a5fbd5bcbdb
-  data.tar.gz: 5574d056f5af9c9a06a066eb0358c6ac9aa27ec2793e34ac728bd26e827aa4adcb43226143b449999f5ea1e41e6de608bea65e70f9fc3f2d75f9103a755546cf
+  metadata.gz: ebfdadfb8be11dace9245a20057a340d24bac44dd3dfb27c83d35477bd2839fe48bd54e66dc8fec068efea4a71fdc66d4f6586e8f67118ca0c10cf4a8f72671f
+  data.tar.gz: a3cdab7a1315b4ddb9294d1945c82e91d0f877ae0917465bcec48ce5bd6256d4e022abc9fbbef4310ca2ff7afe3c867c3957603a654de9b50be403ee25f1ef83

data/README.mdown

@@ -114,6 +114,8 @@ static_js:
 deploy_command: 'wordmove push -t'
 ```
 
+**Note**: remember to add `screen.css` and/or `application.js` if you want to define `static_css` or `static_js`
+
 ## Caveats
 
 - If you attempt to download a WordPress localization that's outdated, the latest English version will be downloaded instead.

data/bin/setup.sh

@@ -3,7 +3,7 @@
 set -e
 
 FIXTURE_PATH="spec/fixtures/wordless"
-WORDLESS_REPO="git://github.com/welaika/wordless.git"
+WORDLESS_ARCHIVE="https://github.com/welaika/wordless/archive/master.tar.gz"
 WORDLESS_PREFERENCES="wordless/theme_builder/vanilla_theme/config/initializers/wordless_preferences.php"
 
 function log {
@@ -11,22 +11,18 @@ function log {
   echo "== [ $1 ] ==";
 }
 
+log "Deleting {$FIXTURE_PATH}..."
 rm -rf $FIXTURE_PATH
+mkdir $FIXTURE_PATH
+echo "Done!"
 
-log "Cloning wordless repo"
-git clone --branch=master $WORDLESS_REPO $FIXTURE_PATH && cd $FIXTURE_PATH
+log "Downloading wordless from github..."
+cd $FIXTURE_PATH
+wget $WORDLESS_ARCHIVE -O - | tar -xz --strip 1
+echo "Done!"
 
-log "Customizing ruby and compass paths"
-echo "# BEGIN: wordless_preferences.php"
+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
-cat $WORDLESS_PREFERENCES
-echo "# END: wordless_preferences.php"
-
-log "Committing changes to test repo"
-git config user.name "Wordless Tester"
-git config user.email "tester@wordless.com"
-git commit -am "updated ruby and compass path"
-
-log "DONE!"
+echo "Done!"

data/lib/wordless/cli.rb

@@ -5,7 +5,7 @@ module Wordless
 
     no_tasks do
       def wordless_cli
-        Wordless::WordlessCLI.new(options, self)
+        Wordless::WordlessCLI.new(self, options)
       end
     end
 
@@ -18,7 +18,7 @@ module Wordless
 
     desc "install", "Install the Wordless plugin into an existing WordPress installation"
     def install
-      wordless_cli.install
+      wordless_cli.install_wordless
     end
 
     desc "theme [NAME]", "Create a new Wordless theme NAME"
@@ -37,8 +37,8 @@ module Wordless
     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"
+    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

data/lib/wordless/cli_helper.rb

@@ -1,5 +1,21 @@
 module Wordless
   module CLIHelper
+    extend ActiveSupport::Concern
+
+    included do
+      [ :say, :run ].each do |sym|
+        define_method sym do |*args|
+          thor.send(sym, *args)
+        end
+        private sym
+      end
+    end
+
+    private
+
+    def thor
+      raise NotImplementedError, "Including class must provide a thor instance object"
+    end
 
     def info(message)
       log_message message
@@ -18,27 +34,18 @@ module Wordless
       log_message message, :yellow
     end
 
-    def download(url, destination)
-      begin
-        f = open(destination, "wb")
-        f.write(open(url).read) ? true : false
-      rescue
-        false
-      ensure
-        f.close
-      end
+    def ensure_wp_cli_installed!
+      error("Cannot continue: WP-CLI is not installed.") unless wp_cli_installed?
     end
 
-    def unzip(file, destination)
-      run_command "unzip #{file} -d #{destination}"
+    def run_command(command)
+      system("#{command} >>#{void} 2>&1")
     end
 
-    def git_installed?
-      run_command("git --version")
+    def wp_cli_installed?
+      run_command("which wp")
     end
 
-    private
-
     def log_message(message, color = nil)
       say message, color
     end
@@ -46,10 +53,5 @@ module Wordless
     def void
       RbConfig::CONFIG['host_os'] =~ /msdos|mswin|djgpp|mingw/ ? 'NUL' : '/dev/null'
     end
-
-    def run_command(command)
-      system("#{command} >>#{void} 2>&1")
-    end
-
   end
 end

data/lib/wordless/version.rb

@@ -1,3 +1,3 @@
 module Wordless
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/wordless/wordless_cli.rb

@@ -1,6 +1,7 @@
 module Wordless
   class WordlessCLI
     include CLIHelper
+
     attr_reader :options, :thor
 
     module PATH
@@ -17,192 +18,165 @@ module Wordless
       PATH::THEMES     => 'wp-content/themes',
     }
 
-    DEFAULT_PATHS.each do |type, value|
-      define_method "#{type}_path" do
-        value
-      end
-    end
-
-    def lib_dir
-      @@lib_dir ||= File.expand_path(File.dirname(__FILE__))
-    end
-
-    def wordpress_dir(current_dir = start_dir)
-      @wordpress_dir ||= (
-        current_dir = File.expand_path(current_dir)
-
-        if File.exist? File.join(current_dir, wp_content_path)
-          current_dir
-        elsif last_dir?(current_dir)
-          raise StandardError, "Could not find a valid Wordpress directory"
-        else
-          wordpress_dir(upper_dir(current_dir))
-        end
-      )
-    end
-
-    def last_dir?(directory)
-      directory == "/"
-    end
-
-    def upper_dir(directory)
-      File.join(directory, '..')
-    end
-
-    def config
-      @@config ||= (
-        if File.exist?(wordfile_path)
-          YAML::load(File.open(wordfile_path)).symbolize_keys
-        else
-          {}
-        end
-      )
-    end
-
-    [ :say, :run ].each do |sym|
-      define_method sym do |*args|
-        thor.send(sym, *args)
-      end
-    end
-
-    def initialize(options = {}, thor = nil)
+    def initialize(thor, options = {})
       @options = options
       @thor = thor
     end
 
     def start(name)
-      WordPressTools::CLI.new.invoke('new', [name], options)
-      Dir.chdir(name)
-      install
+      install_wordpress_and_wp_cli(name)
+      ensure_wp_cli_installed!
+
+      install_wordless
       create_theme(name)
-      if wp_cli_installed?
-        activate_plugin
-        activate_theme(name)
-        set_permalinks
-      else
-        warning("WP-CLI is not installed. Cannot activate wordless plugin and theme")
-      end
+      activate_theme(name)
+      set_permalinks
     end
 
-    def install
-      at_wordpress_root!
+    def install_wordless
+      ensure_wp_cli_installed!
 
-      unless git_installed?
-        error "Git is not available. Please install git."
-      end
+      info("Installing and activating plugin...")
 
-      if File.directory?(plugins_path)
-        if run_command "git clone #{wordless_repo} #{wordless_plugin_path}"
-          success "Installed Wordless plugin."
+      at_wordpress_root do
+        error("Directory '#{plugins_path}' not found.") unless File.directory?(plugins_path)
+        if run_command("wp plugin install wordless --activate")
+          success("Done!")
         else
-          error "There was an error installing the Wordless plugin."
+          error("There was an error installing and/or activating the Wordless plugin.")
         end
-      else
-        error "Directory '#{plugins_path}' not found."
       end
     end
 
-    def activate_plugin
-      info("Activating wordless plugin...")
-      run_command("wp plugin activate wordless") || error("Cannot activate wordless plugin")
-      success("Done!")
-    end
-
-    def activate_theme(name)
-      info("Activating theme...")
-      run_command("wp theme activate #{name}") || error("Cannot activate theme '#{name}'")
-      success("Done!")
-    end
-
-    def set_permalinks
-      info("Setting permalinks for wordless...")
-      run_command("wp rewrite structure /%postname%/") || error("Cannot set permalinks")
-      success("Done!")
-    end
-
     def create_theme(name)
-      at_wordpress_root!
-
-      if File.directory?(themes_path)
-        if system "php #{File.join(lib_dir, 'theme_builder.php')} #{name}"
-          success "Created a new Wordless theme in '#{File.join(themes_path, 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 "Couldn't create Wordless theme."
+          error("Directory '#{themes_path}' not found.")
         end
-      else
-        error "Directory '#{themes_path}' not found."
       end
     end
 
     def compile
-      at_wordpress_root!
-
-      if system "php #{File.join(lib_dir, 'compile_assets.php')}"
-        success "Compiled static assets."
-      else
-        error "Couldn't compile static assets."
+      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!
+      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'])
 
-      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'])
+          (static_css + static_js).each do |file|
+            FileUtils.rm_f(file) if File.exist?(file)
+          end
 
-        (static_css + static_js).each do |file|
-          FileUtils.rm_f(file) if File.exist?(file)
+          success("Cleaned static assets.")
+        else
+          error("Directory '#{themes_path}' not found.")
         end
-
-        success "Cleaned static assets."
-      else
-        error "Directory '#{themes_path}' not found."
       end
     end
 
     def deploy
-      at_wordpress_root!
+      at_wordpress_root do
+        compile if options['refresh']
 
-      compile if options['refresh']
+        deploy_command = options['command'].presence || config[:deploy_command]
 
-      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 deploy_command
-        system "#{deploy_command}"
-      else
-        error "deploy_command not set. Make sure it is included in your Wordfile."
+        clean if options['refresh']
       end
-
-      clean if options['refresh']
     end
 
     private
 
-    def start_dir
-      "."
+    DEFAULT_PATHS.each do |type, value|
+      define_method "#{type}_path" do
+        value
+      end
     end
 
-    def at_wordpress_root!
-      Dir.chdir(wordpress_dir)
+    def lib_dir
+      @@lib_dir ||= File.expand_path(File.dirname(__FILE__))
     end
 
-    def wordless_plugin_path
-      File.join(plugins_path, "wordless")
+    def wordpress_dir(current_dir = Dir.pwd)
+      @wordpress_dir ||= (
+        current_dir = File.expand_path(current_dir)
+
+        if File.exist?(File.join(current_dir, wp_content_path))
+          current_dir
+        elsif last_dir?(current_dir)
+          error("Could not find a valid Wordpress directory")
+        else
+          wordpress_dir(upper_dir(current_dir))
+        end
+      )
     end
 
-    def wordless_repo
-      config[:wordless_repo] || 'git://github.com/welaika/wordless.git'
+    def last_dir?(directory)
+      directory == "/"
+    end
+
+    def upper_dir(directory)
+      File.join(directory, '..')
+    end
+
+    def config
+      @@config ||= (
+        if File.exist?(wordfile_path)
+          YAML::load(File.open(wordfile_path)).symbolize_keys
+        else
+          {}
+        end
+      )
     end
 
-    def add_git_repo(repo, destination)
-      run_command("git clone #{repo} #{destination}")
+    def at_wordpress_root
+      pwd = Dir.pwd
+      Dir.chdir(wordpress_dir)
+      begin
+        yield
+      ensure
+        Dir.chdir(pwd)
+      end
     end
 
-    def wp_cli_installed?
-      run_command("which wp")
+    def install_wordpress_and_wp_cli(name)
+      WordPressTools::CLI.new.invoke('new', [name], options)
     end
 
+    def activate_theme(name)
+      at_wordpress_root do
+        info("Activating theme...")
+        run_command("wp theme activate #{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")
+        success("Done!")
+      end
+    end
   end
 end
-

data/wordless.gemspec

@@ -26,10 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "compass"
   spec.add_dependency "coffee-script"
   spec.add_dependency "yui-compressor"
-  spec.add_dependency "wordpress_tools", "~> 1.1.1"
+  spec.add_dependency "wordpress_tools", "~> 1.1.2"
 
-  spec.add_development_dependency "rspec", "< 3.0.0"
-  spec.add_development_dependency "fakeweb", "~> 1.3"
+  spec.add_development_dependency "rspec", "~> 3.2.0"
   spec.add_development_dependency "pry-byebug", "~> 3.0"
   spec.add_development_dependency "priscilla", "~> 1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordless
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - "Étienne Després"
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,42 +104,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement