wpcli 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79d2539033f6ff4a9ebff3f11514e9ef0a6a235
-  data.tar.gz: f243137c295793ec30d0afa143718988a4af9972
+  metadata.gz: 7420ce749bad764f4dda2f91b153f58960e83b96
+  data.tar.gz: e50fd5760ae5ff81b700fce11b0a11b8e46302fd
 SHA512:
-  metadata.gz: 578721c1e23b7c141669ad89a230f5bea346995b361bf9196f14f33dcfc6af85c0b74a4fa230cb4120be7bc802d16b8561868e61e836e5353e2726ca4b4dc8cc
-  data.tar.gz: 9ad6e2f62fb2d8edcebe1679801bede22248673d6a4cee5f6dea1da9f86af8a13bb2c8d95bb9e080f801b10e62513288be139aa5e7ce19e7ee3ec8326539bf62
+  metadata.gz: 2ae33c6283a5f25718357318e4256e5cf4a6c6d7f11e35bab2c117846b0d415817a92e7b794586117fb9d98aba75b9d17895541360c6cda6eb955259d30a326e
+  data.tar.gz: 544697a49646184df988918d1ba4b87809e3db528925715da58b755db9daf34763057444ce9957744f64334b9bb04affc807e22479a9aa0e4ec8c54b5522ce7c

data/README.md

@@ -8,7 +8,7 @@ Just pass commands (http://wp-cli.org/commands/) to run method and use returned
 
 Add this line to your application's Gemfile:
 
-    gem 'wpcli', "~> 0.1.5"
+    gem 'wpcli', "~> 0.2.0"
 
 And then execute:
 
@@ -60,4 +60,4 @@ If you like to use client for example in command line, you can create instance w
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-[![Gem Version](https://badge.fury.io/rb/wpcli.png)](http://badge.fury.io/rb/wpcli)
+[![Gem Version](https://badge.fury.io/rb/wpcli.png)](http://badge.fury.io/rb/wpcli) [![Build Status](https://travis-ci.org/hasanen/wpcli.png?branch=master)](https://travis-ci.org/hasanen/wpcli)

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+task :default => :spec
+RSpec::Core::RakeTask.new

data/lib/wpcli/client.rb

@@ -19,7 +19,16 @@ module Wpcli
           if index < first_data_row
             @columns = parse_header line, separator
           else
-            rows << parse_line(line, separator)
+            if single_value_response
+              parsed_line = parse_line(line, separator)
+              value = parsed_line[:value]
+              unless value.nil? || value == "null"
+                rows << {} unless rows.size == 1
+                rows.first[parsed_line[:field].to_sym] = value
+              end
+            else
+              rows << parse_line(line, separator)
+            end
           end
         end
       end
@@ -29,6 +38,7 @@ module Wpcli
     def parse_header line, separator
       columns = []
       line.split(separator).each_with_index do |column, index|
+        detect_if_line_is_from_single_value_response column
         columns[index] = column.strip.downcase unless column.strip.empty?
       end
       columns
@@ -44,5 +54,13 @@ module Wpcli
     def starts_with_plus? line
       line.start_with? "+"
     end
+
+    def detect_if_line_is_from_single_value_response column
+      @single_value = column.strip.downcase == "field" unless @single_value
+    end
+
+    def single_value_response
+      @single_value
+    end
   end
 end

data/lib/wpcli/version.rb

@@ -1,3 +1,3 @@
 module Wpcli
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/spec/wpcli/client_spec.rb

@@ -23,8 +23,36 @@ let(:wp_user_list_tabs_newlines) { "ID\tuser_login\tdisplay_name\tuser_email\tus
 | Contributor      | contributor                        |
 | Subscriber       | subscriber                         |
 +------------------+------------------------------------+
+EOF
+  end
+
+  let(:single_user) do <<EOF
++---------------------+------------------------------------+
+| Field               | Value                              |
++---------------------+------------------------------------+
+| ID                  | 1                                  |
+| user_login          | username                           |
+| user_pass           | hash_of_paassword                  |
+| user_nicename       | Firstname Lastname                 |
+| user_email          |                                    |
+| user_url            |                                    |
+| user_registered     | 2013-11-25 12:41:38                |
+| user_activation_key |                                    |
+| user_status         | 0                                  |
+| display_name        | Nickname                           |
+| roles               | administrator                      |
++---------------------+------------------------------------+
+EOF
+    end
+    let(:single_user_not_found) do <<EOF
++-------+-------+
+| Field | Value |
++-------+-------+
+| roles | null  |
++-------+-------+
 EOF
     end
+
   describe '.new' do
     let(:path) { "path_to_wp" }
     let(:command) { "user role" }
@@ -128,5 +156,50 @@ EOF
         end
       end
     end
+
+    context 'single user' do
+      before :each do
+        @wpcli.stub(:`).with("wp user get username").and_return(single_user)
+        @array = @wpcli.run "user get username"
+      end
+
+      describe 'returns array' do
+          it { @array.kind_of?(Array).should be(true) }
+
+          it 'which has one hash' do
+           @array.size.should eq(1)
+          end
+
+
+        it 'hash has correct columns' do
+          @array.first.has_key?(:ID).should be(true)
+          @array.first.has_key?(:user_login).should be(true)
+          @array.first.has_key?(:user_pass).should be(true)
+          @array.first.has_key?(:user_nicename).should be(true)
+          @array.first.has_key?(:user_email).should be(true)
+          @array.first.has_key?(:user_url).should be(true)
+          @array.first.has_key?(:user_registered).should be(true)
+          @array.first.has_key?(:user_activation_key).should be(true)
+          @array.first.has_key?(:user_status).should be(true)
+          @array.first.has_key?(:display_name).should be(true)
+          @array.first.has_key?(:roles).should be(true)
+          @array.first.keys.size.should eq(11)
+        end
+      end
+    end
+    context 'single user not found' do
+      before :each do
+        @wpcli.stub(:`).with("wp user get username").and_return(single_user_not_found)
+        @array = @wpcli.run "user get username"
+      end
+
+      describe 'returns array' do
+          it { @array.kind_of?(Array).should be(true) }
+
+          it 'which has zore hash' do
+            @array.size.should eq(0)
+          end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wpcli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Joni Hasanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler