wpcli 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7814f79614d1d4afc430dedb1ea644143ad08909
-  data.tar.gz: d3e16bf8a536e93c5c3b3610232bdf0cfad80106
+  metadata.gz: a08217834623204a2593c7ad1b3c8e977b9910de
+  data.tar.gz: 3a04774e8fc09ca06ebfc6efc2ed8b4e464f7d70
 SHA512:
-  metadata.gz: 307303ea986e3838c693bc3872e96f164b48a4f74285204694ee9d9f69d2b6cca748384f736420a809cab620f8a43c903b0c0bc512866a42cc0e3ea384783fa0
-  data.tar.gz: b6be0a1fe3bd1802f23e5834d0bb7303cdfe9d4ad28a7a5df1067b7280e86c22b39e84ffaf935ddb9841bac9fc942be07540b286ef46d47c27f8aa00b6474591
+  metadata.gz: e6c8e2b4df9d33724ee9b7b20b8c77cd24e678865544ebc546ef6c58380fa77db11023ea9428a5e440105dbfe23f28a7d1f0238fe53c653a9f4485e1a0c8b8b1
+  data.tar.gz: e75241aaec3ce110a2da88badb2f6087a7aadb34a06bb1cee3fa75dc712c6653714eee0cacabb1ad0bfbfc4222605b4f3b058699a0a4b81faebbb3788df1926b

data/lib/wpcli/client.rb

@@ -11,6 +11,7 @@ module Wpcli
     private
 
     def parse text
+      single_value = false
       first_data_row = starts_with_plus?(text) ? 3 : 1
       rows = []
       text.split("\n").each_with_index do |line, index|
@@ -18,8 +19,9 @@ module Wpcli
           separator = line.include?('|') ? '|' : "\t"
           if index < first_data_row
             @columns = parse_header line, separator
+            single_value = detect_if_line_is_from_single_value_response
           else
-            if single_value_response
+            if single_value
               parsed_line = parse_line(line, separator)
               value = parsed_line[:value]
               unless value.nil? || value == "null"
@@ -42,7 +44,6 @@ 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
@@ -59,12 +60,11 @@ module Wpcli
       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
+    def detect_if_line_is_from_single_value_response
+      @columns.each do |column|
+        return true if !column.nil? && column.strip.downcase == "field"
+      end
+      false
     end
   end
 end

data/lib/wpcli/version.rb

@@ -1,3 +1,3 @@
 module Wpcli
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/wpcli/client_spec.rb

@@ -11,6 +11,7 @@ describe Wpcli::Client do
 EOF
     end
 let(:wp_user_list_tabs_newlines) { "ID\tuser_login\tdisplay_name\tuser_email\tuser_registered\troles\n1\tadmin\tadmin\tadmin@domain.tld\t2014-01-07 09:04:08\tadministrator\n" }
+let(:wp_role_list_tabs_newlines) { "name\trole\nAdministrator\tadministrator\nEditor\teditor\nAuthor\tauthor\nContributor\tcontributor\nSubscriber\tsubscriber\n" }
 
 
   let(:wp_role_list) do <<EOF
@@ -201,5 +202,32 @@ EOF
           end
       end
     end
+
+    context 'multivalue after single value' do
+      before :each do
+        @wpcli.stub(:`).with("wp user get username").and_return(single_user)
+        @array = @wpcli.run "user get username"
+        @wpcli.stub(:`).with("wp role list").and_return(wp_role_list_tabs_newlines)
+        @array = @wpcli.run "role list"
+      end
+
+      describe 'returns array' do
+        it { @array.kind_of?(Array).should be(true)}
+
+        it 'which contains hashes' do
+          @array.first.kind_of?(Hash).should be(true)
+        end
+
+        it 'which has five hashes' do
+          @array.size.should eq(5)
+        end
+
+        it 'first hash has correct columns' do
+          @array.first.has_key?(:name).should be(true)
+          @array.first.has_key?(:role).should be(true)
+          @array.first.keys.size.should eq(2)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: wpcli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Joni Hasanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 description: Simple wrapper for wp-cli (http://wp-cli.org/)
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -99,17 +99,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple wrapper for wp-cli (http://wp-cli.org/)