wordless 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    wordless (0.0.2)
+    wordless (0.2.1)
       thor
+      wordpress_tools (~> 0.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -18,6 +19,8 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
     thor (0.14.6)
+    wordpress_tools (0.0.1)
+      thor
 
 PLATFORMS
   ruby

data/lib/wordless/cli.rb

@@ -3,6 +3,7 @@ require 'thor'
 require 'net/http'
 require 'rbconfig'
 require 'tempfile'
+require 'wordpress_tools/cli'
 require 'wordless/cli_helper'
 
 module Wordless
@@ -18,65 +19,15 @@ module Wordless
       end
     end
     
-    desc "new NAME", "download WordPress in directory NAME, 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"
     method_option :locale, :aliases => "-l", :desc => "WordPress locale (default is en_US)"
     def new(name)
-      invoke('wp', [name], :bare => true, :locale => options['locale'])
+      WordPressTools::CLI.new.invoke('new', [name], :bare => true, :locale => options['locale'])
       Dir.chdir(name)
       Wordless::CLI.new.invoke(:install)
       invoke('theme', [name])
     end
     
-    desc "wp DIR_NAME", "download the latest stable version of WordPress in a new directory DIR_NAME (default is wordpress)"
-    method_option :locale, :aliases => "-l", :desc => "WordPress locale (default is en_US)"
-    method_option :bare, :aliases => "-b", :desc => "Remove default themes and plugins"
-    def wp(dir_name = 'wordpress')
-      download_url, version, locale = Net::HTTP.get('api.wordpress.org', "/core/version-check/1.5/?locale=#{options[:locale]}").split[2,3]
-      downloaded_file = Tempfile.new('wordpress')
-      begin
-        puts "Downloading WordPress #{version} (#{locale})..."
-
-        unless download(download_url, downloaded_file.path)
-          error "Couldn't download WordPress."
-          return
-        end
-        
-        unless unzip(downloaded_file.path, dir_name)
-          error "Couldn't unzip WordPress."
-          return
-        end
-        
-        subdirectory = Dir["#{dir_name}/*/"].first # This is probably 'wordpress', but don't assume
-        FileUtils.mv Dir["#{subdirectory}*"], dir_name # Remove unnecessary directory level
-        Dir.delete subdirectory
-      ensure
-         downloaded_file.close
-         downloaded_file.unlink
-      end
-      
-      success %Q{Installed WordPress in directory "#{dir_name}".}
-      
-      if options[:bare]
-        dirs = %w(themes plugins).map {|d| "#{dir_name}/wp-content/#{d}"}
-        FileUtils.rm_rf dirs
-        FileUtils.mkdir dirs
-        dirs.each do |dir|
-          FileUtils.cp "#{dir_name}/wp-content/index.php", dir
-        end
-        success "Removed default themes and plugins."
-      end
-      
-      if git_installed?
-        if run "cd #{dir_name} && git init", :verbose => false, :capture => true
-          success "Initialized git repository."
-        else
-          error "Couldn't initialize git repository."
-        end
-      else
-        warning "Didn't initialize git repository because git isn't installed."
-      end
-    end
-    
     desc "install", "install the Wordless plugin into an existing WordPress installation"
     def install
       unless git_installed?

data/lib/wordless/version.rb

@@ -1,3 +1,3 @@
 module Wordless
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/cli_spec.rb

@@ -29,43 +29,10 @@ describe Wordless::CLI do
     end
   end
   
-  context "#wp" do
-    context "with no arguments" do
-      it "downloads a copy of WordPress" do
-        Wordless::CLI.start ['wp']
-        File.exists?('wordpress/wp-content/index.php').should eq true
-      end
-
-      it "initializes a git repository" do
-        Wordless::CLI.start ['wp']
-        File.directory?('wordpress/.git').should eq true
-      end
-      
-      it "doesn't leave a stray 'wordpress' directory" do
-        Wordless::CLI.start ['wp']
-        File.directory?('wordpress/wordpress').should eq false
-      end
-    end
-    
-    context "with a custom directory name" do
-      it "downloads a copy of WordPress in directory 'myapp'" do
-        Wordless::CLI.start ['wp', 'myapp']
-        File.exists?('myapp/wp-content/index.php').should eq true
-      end
-    end
-    
-    context "with the 'bare' option" do
-      it "downloads a copy of WordPress and removes default plugins and themes" do
-        Wordless::CLI.start ['wp', '--bare']
-        (File.exists?('wordpress/wp-content/plugins/plugin.php') || File.directory?('wordpress/wp-content/themes/theme')).should eq false
-      end
-    end
-  end
-  
   context "#install" do
     context "with a valid WordPress installation" do
       it "installs the Wordless plugin" do
-        Wordless::CLI.start ['wp']
+        WordPressTools::CLI.start ['new']
         Dir.chdir 'wordpress'
         Wordless::CLI.start ['install']
         File.directory?('wp-content/plugins/wordless').should eq true
@@ -83,7 +50,7 @@ describe Wordless::CLI do
   context "#theme" do
     context "with a valid WordPress installation and the Wordless plugin" do
       before :each do
-        Wordless::CLI.start ['wp']
+        WordPressTools::CLI.start ['new']
         Dir.chdir 'wordpress'
         Wordless::CLI.start ['install']
       end
@@ -103,7 +70,7 @@ describe Wordless::CLI do
     end
   end
   
-  context "#compile", :now => true do
+  context "#compile" do
     context "with a valid Wordless installation" do
       before :each do
         Wordless::CLI.start ['new', 'myapp']

data/spec/spec_helper.rb

@@ -26,6 +26,8 @@ RSpec.configure do |config|
   #     end
   #   end
   # end
+
+  FileUtils.mkdir('tmp') unless File.directory? 'tmp'
   
   def capture(stream)
     begin

data/wordless.gemspec

@@ -4,11 +4,12 @@ require File.expand_path('../lib/wordless/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Étienne Després"]
   gem.email         = ["etienne@molotov.ca"]
-  gem.description   = %q{Wordless}
+  gem.description   = %q{Command line tool to manage Wordless themes.}
   gem.summary       = %q{Manage Wordless themes.}
   gem.homepage      = "http://github.com/etienne/wordless_gem"
   
   gem.add_dependency "thor"
+  gem.add_dependency "wordpress_tools", '~> 0.0.1'
   
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'fakeweb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordless
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70294941484300 !ruby/object:Gem::Requirement
+  requirement: &70234166003760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294941484300
+  version_requirements: *70234166003760
+- !ruby/object:Gem::Dependency
+  name: wordpress_tools
+  requirement: &70234166002920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70234166002920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70294941483880 !ruby/object:Gem::Requirement
+  requirement: &70234166002260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294941483880
+  version_requirements: *70234166002260
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70294941483400 !ruby/object:Gem::Requirement
+  requirement: &70234166001480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,8 +54,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294941483400
-description: Wordless
+  version_requirements: *70234166001480
+description: Command line tool to manage Wordless themes.
 email:
 - etienne@molotov.ca
 executables: