zenflow 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a0a86e94828d1a8dc8cf6d84367463efcfd4a6c
-  data.tar.gz: b3544bd8cb5bc89fc525ce06a72bf4853e7c36e2
+  metadata.gz: f6b5ec1c611f21f5487788d92b5befb16e679769
+  data.tar.gz: 91bd9a989c89cdbe14712829907157abfbfabaa2
 SHA512:
-  metadata.gz: 70da301341826b7fb54e659722e231bbbf7656ce1291c699dc3ed973e20b2cdf8492a13b423f50bd5af00142dcb670bfca6c9ac3520b40f3018d83d8c93137a1
-  data.tar.gz: b8e6fa22c96321a2b56ee1140e0ac4413472959844fba16f17c01d60597f7b944af50d5707e153c8f540b38464933e4ddbe517493780c6bde72dc24c4ae65e2b
+  metadata.gz: 7c5a484cf2e3b0b99a9ab72c52f73ba1b91aa723181ae44b626a9ca8e087b58fdb6b1f22aa3e0291092609ab825ac1c0c02800c21620b7bab41297faf99c851b
+  data.tar.gz: 8369252eaa940ddffa8d49313609335c4a53a2c11b6648bcf5d2ab72bae50394ec73f7b20f53127a69b269d6b9cb43c7273ba5075a8480ee507cf19ec117377b

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 major: 0
 minor: 8
-patch: 0
+patch: 1
 pre:

data/bin/zenflow

@@ -3,10 +3,12 @@ $: << File.expand_path("#{File.dirname(__FILE__)}/../lib")
 require 'rubygems'
 require 'zenflow'
 
+ALLOWED_COMMANDS_BEFORE_CONFIG = ['init', '-h', '--help', '-v', '--version']
+
 Zenflow::LogToFile("====== Zenflow #{Zenflow::VERSION}/#{Time.now.strftime('%c')} ======")
 Zenflow::LogToFile("$ zenflow #{ARGV.join(' ')}\n")
 
-if ARGV.first != "init" && !Zenflow::Config.configured?
+if !ALLOWED_COMMANDS_BEFORE_CONFIG.include?(ARGV.first) && !Zenflow::Config.configured?
   Zenflow::Log("This project has not been configured. Please run `zenflow init`.", :color => :red)
   exit(1)
 end

data/lib/zenflow.rb

@@ -4,7 +4,6 @@ require 'colored'
 require 'terminal-table'
 require 'httparty'
 require 'json'
-
 require 'zenflow/helpers/version'
 require 'zenflow/version'
 require 'zenflow/helpers/log'

data/lib/zenflow/cli.rb

@@ -50,8 +50,9 @@ module Zenflow
 
     desc "set_up_github", "Set up GitHub user information"
     def set_up_github
-      if user = Zenflow::Github.user != ''
-        if Zenflow::Ask("Your GitHub user is currently #{Zenflow::Github.user}. Do you want to use that?", :options => ["y", "N"], :default => "Y") == "n"
+      user = Zenflow::Github.user
+      if user.to_s != ''
+        if Zenflow::Ask("Your GitHub user is currently #{user}. Do you want to use that?", :options => ["y", "N"], :default => "Y") == "n"
           Zenflow::Github.set_user
         end
       else

data/lib/zenflow/helpers/github.rb

@@ -2,12 +2,14 @@ module Zenflow
 
   module Github
     def self.user
-      Zenflow::Shell.run('git config --get github.user', silent: true).chomp
+      user = Zenflow::Shell.run('git config --get github.user', silent: true)
+      user = user.chomp unless user.nil?
+      user
     end
 
     def self.zenflow_token
-      zenflow_token = Zenflow::Shell.run('git config --get zenflow.token', silent: true).chomp
-      zenflow_token = nil if zenflow_token.to_s.strip == ''
+      zenflow_token = Zenflow::Shell.run('git config --get zenflow.token', silent: true)
+      zenflow_token = zenflow_token.chomp unless zenflow_token.nil?
       zenflow_token
     end
 
@@ -22,11 +24,11 @@ module Zenflow
         return
       end
     end
-  end
 
-  def self.set_user
-    username = Zenflow::Ask("What is your Github username?")
-    Zenflow::Shell.run("git config --global github.user #{username}", silent: true)
+    def self.set_user
+      username = Zenflow::Ask("What is your Github username?")
+      Zenflow::Shell.run("git config --global github.user #{username}", silent: true)
+    end
   end
 
   class GithubRequest

data/lib/zenflow/helpers/shell.rb

@@ -53,7 +53,7 @@ module Zenflow
       def run_with_result_check(command, options={})
         output = `#{command}`
         Zenflow::LogToFile(output)
-        if last_exit_status.to_i > 0
+        if last_exit_status.to_i > 0 && !options[:silent]
           if output.strip != ""
             puts "#{output.strip}\n"
           end

data/spec/zenflow/helpers/cli_spec.rb

@@ -19,6 +19,47 @@ describe Zenflow::CLI do
     end
   end
 
+  describe "#set_up_github" do
+    context "when a github user is already saved" do
+      before do
+        Zenflow::Github.should_receive(:user).and_return('user')
+      end
+
+      context "and the user decides to set a new one" do
+        before do
+          Zenflow.should_receive(:Ask).and_return('n')
+        end
+
+        it "authorizes with Github" do
+          Zenflow::Github.should_receive(:set_user)
+          subject.set_up_github
+        end
+      end
+
+      context "and the user decides not to set a new one" do
+        before do
+          Zenflow.should_receive(:Ask).and_return('y')
+        end
+
+        it "does not authorize with Github" do
+          Zenflow::Github.should_not_receive(:set_user)
+          subject.set_up_github
+        end
+      end
+    end
+
+    context "when a zenflow_token is not already saved" do
+      before do
+        Zenflow::Github.should_receive(:user).and_return(nil)
+      end
+
+      it "authorizes with Github" do
+        Zenflow::Github.should_receive(:set_user)
+        subject.set_up_github
+      end
+    end
+  end
+
   describe "#authorize_github" do
     context "when a zenflow_token is already saved" do
       before do

data/spec/zenflow/helpers/github_spec.rb

@@ -13,6 +13,16 @@ describe Zenflow::Github do
     end
   end
 
+  describe '.set_user' do
+    let(:user){'github-user'}
+
+    it 'asks for the user name and sets it to github.user' do
+      Zenflow.should_receive(:Ask).and_return(user)
+      Zenflow::Shell.should_receive(:run).with(/github\.user #{user}/, silent: true)
+      Zenflow::Github.set_user
+    end
+  end
+
   describe '.authorize' do
     context "when authorization fails" do
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenflow
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Adam Kittelson