wpcli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fca8942bc3ffe4f2bee63bea736a9889b2decbd7
-  data.tar.gz: 72f4f7b44419d0b882bc803ff2fd91b7fbc32a27
+  metadata.gz: 560f99a2ca9a0c5b2045fa77d4bf89853802c9b5
+  data.tar.gz: 44257dfbf43d531180b5149ace6f2728d1304947
 SHA512:
-  metadata.gz: e0bc2796da39c0b1a7d77206335a791fe87fbbab0fc5d24715e68c41d458f7792000deef98f98fb5b5b47616cc9e809c70343c9af123be1451159d3a9c6e2b4a
-  data.tar.gz: 0c90178543388a1bd3048edff0e2a98d27f4dbfa1c62061f41848b5847095aac318ab2fd3849824679db35361cf7a7d6e96b1420491203f46937a00cb11a2cff
+  metadata.gz: f73bcc7de07cba8cd5df628b7a989d5583009fc989c929922aab4437a31c545fe7416c0987f700a577b64c745d9c0352c1327bd68ecbed337aa17225ef786679
+  data.tar.gz: 0ed2030655252ca8972364cfee879cd9c81d5116723ecb4fff73f84bebe67d2e5ec284fd347bcba510fdd36ca7fc7215f9b8089daafe12071e094b9a17929e6a

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.0"
+    gem 'wpcli', "~> 0.1.2"
 
 And then execute:
 

data/lib/wpcli/client.rb

@@ -11,35 +11,37 @@ module Wpcli
     private
 
     def parse text
+      first_data_row = starts_with_plus?(text) ? 3 : 1
       rows = []
       text.split("\n").each_with_index do |line, index|
-        unless separator? line
-          if index < 3
-            @columns = parse_header line
+        unless starts_with_plus? line
+          separator = line.include?('|') ? '|' : "\t"
+          if index < first_data_row
+            @columns = parse_header line, separator
           else
-            rows << parse_line(line)
+            rows << parse_line(line, separator)
           end
         end
       end
       rows
     end
 
-    def parse_header line
+    def parse_header line, separator
       columns = []
-      line.split('|').each_with_index do |column, index|
+      line.split(separator).each_with_index do |column, index|
         columns[index] = column.strip.downcase unless column.strip.empty?
       end
       columns
     end
-    def parse_line line
+    def parse_line line, separator
       hash = {}
-      line.split('|').each_with_index do |column, index|
+      line.split(separator).each_with_index do |column, index|
         hash[@columns[index].to_sym] = column.strip unless @columns[index].nil?
       end
       hash
     end
 
-    def separator? line
+    def starts_with_plus? line
       line.start_with? "+"
     end
   end

data/lib/wpcli/version.rb

@@ -1,3 +1,3 @@
 module Wpcli
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/wpcli/client_spec.rb

@@ -10,6 +10,8 @@ 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) do <<EOF
 +------------------+------------------------------------+
@@ -69,32 +71,62 @@ EOF
     end
 
     context 'user list' do
-      before :each do
-        @wpcli.stub(:`).with("wp user list").and_return(wp_user_list)
-        @array = @wpcli.run "user list"
-      end
+      context 'pretty format' do
+        before :each do
+          @wpcli.stub(:`).with("wp user list").and_return(wp_user_list)
+          @array = @wpcli.run "user list"
+        end
 
-      describe 'returns array' do
-        it { @array.kind_of?(Array).should be(true) }
+        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 contains hashes' do
+            @array.first.kind_of?(Hash).should be(true)
+          end
 
-        it 'which has two hashes' do
-         @array.size.should eq(2)
+          it 'which has two hashes' do
+           @array.size.should eq(2)
+          end
+
+          it 'first hash has correct columns' do
+            @array.first.has_key?(:id).should be(true)
+            @array.first.has_key?(:display_name).should be(true)
+            @array.first.has_key?(:user_email).should be(true)
+            @array.first.has_key?(:user_registered).should be(true)
+            @array.first.has_key?(:user_login).should be(true)
+            @array.first.has_key?(:roles).should be(true)
+            @array.first.keys.size.should eq(6)
+          end
+        end
+      end
+      context 'tabs and newlines' do
+        before :each do
+          @wpcli.stub(:`).with("wp user list").and_return(wp_user_list_tabs_newlines)
+          @array = @wpcli.run "user list"
         end
 
-        it 'first hash has correct columns' do
-          @array.first.has_key?(:id).should be(true)
-          @array.first.has_key?(:display_name).should be(true)
-          @array.first.has_key?(:user_email).should be(true)
-          @array.first.has_key?(:user_registered).should be(true)
-          @array.first.has_key?(:user_login).should be(true)
-          @array.first.has_key?(:roles).should be(true)
-          @array.first.keys.size.should eq(6)
+        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 two hashes' do
+           @array.size.should eq(1)
+          end
+
+          it 'first hash has correct columns' do
+            @array.first.has_key?(:id).should be(true)
+            @array.first.has_key?(:display_name).should be(true)
+            @array.first.has_key?(:user_email).should be(true)
+            @array.first.has_key?(:user_registered).should be(true)
+            @array.first.has_key?(:user_login).should be(true)
+            @array.first.has_key?(:roles).should be(true)
+            @array.first.keys.size.should eq(6)
+          end
         end
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wpcli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joni Hasanen