githubissues-port 1.4.6 → 1.4.7

data/lib/githubissues-port/export.rb

@@ -41,8 +41,10 @@ module Githubissues
          if @params[:params]['options']=='and'
           params=params.merge({:labels=>@params[:params]['labels'].join(',')}) unless @params[:params][:labels].blank?
          else
-          params=params.merge({:labels=>labels}) unless labels.blank?
+          params=params.merge({:labels=>labels}) unless labels.blank? && @params[:params][:labels].blank?
          end
+         p "paramssssssssssssssssssssssss"
+         p params
          params
 
       end
@@ -52,14 +54,18 @@ module Githubissues
           heading = sheet.styles.add_style sz: 12,b:true, fg_color: "0C65D1"
           sheet.add_row @fields  ,style:heading
           issues=[]
-          if @params[:params]['options']=='or'
-           @params[:params]['labels'].each do |labels|
-             issues=issues + (connection.issues.list self.generate_params(state,labels))
-           end
+          if @params[:params][:labels].blank?
+            labels=[]
+            issues=connection.issues.list self.generate_params(state,labels)
+          elsif @params[:params]['options']=='or' 
+             @params[:params]['labels'].each do |labels|
+            issues=issues + (connection.issues.list self.generate_params(state,labels))
+          end
           else
             labels=[]
             issues=connection.issues.list self.generate_params(state,labels)
           end
+          
           issues.each{|issue| sheet.add_row generate_row(issue)}
         end      
       end

data/lib/githubissues-port/import.rb

@@ -19,6 +19,8 @@ module Githubissues
       def parse_excel
         creek = Creek::Book.new path, :check_file_extension => false
         sheet= creek.sheets[0]
+        p "***********************************88"
+        p sheet.rows.size
         sheet.rows.each_with_index do |row, row_index|
           break if row.first.nil? and row[1].nil?
           row_number = row_index + 1

data/lib/githubissues-port/version.rb

@@ -1,5 +1,5 @@
 module Githubissues
   module Port   
-    VERSION = "1.4.6"
+    VERSION = "1.4.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: githubissues-port
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &76692150 !ruby/object:Gem::Requirement
+  requirement: &82052410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76692150
+  version_requirements: *82052410
 - !ruby/object:Gem::Dependency
   name: creek
-  requirement: &76691620 !ruby/object:Gem::Requirement
+  requirement: &82052080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76691620
+  version_requirements: *82052080
 - !ruby/object:Gem::Dependency
   name: axlsx
-  requirement: &76691150 !ruby/object:Gem::Requirement
+  requirement: &82051600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *76691150
+  version_requirements: *82051600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &76688720 !ruby/object:Gem::Requirement
+  requirement: &82051170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 10.1.1
   type: :development
   prerelease: false
-  version_requirements: *76688720
+  version_requirements: *82051170
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76688410 !ruby/object:Gem::Requirement
+  requirement: &82050750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76688410
+  version_requirements: *82050750
 description: An Excel import/export extension for github issues in Ruby.
 email: 
 executables: []