instapusher 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86917f65bf8082648676b3cfab63bda29cf02f9a
-  data.tar.gz: d3caeb037564958fe3dfb85c7c497c5ba43851ae
+  metadata.gz: 763e12fcfdc87a4a6a1b88eb7e466e4bae5770a3
+  data.tar.gz: 74b0126234f0211e6954b396a339ffa31a94807e
 SHA512:
-  metadata.gz: 3749cd7596f66ee0afc6e160931c752caf34caf9832d04277131c61d9d41aab13ac5d13c95b2e791596cbf2ca518d0948f5dfa0f5e002d3773fb4222d5d65e4b
-  data.tar.gz: be068428eb629db62c79a33bb59221046f23117682b265cc9d581af6c2465aff090dd73d6082fb04eaa4c1d436f657715d8f211a61dd56c7a13ad6d9e824b53b
+  metadata.gz: ed3c74edb2c2aff7d80cb9d26fd64acb090a2fa3f3799bebe7a2b47ac985c0a651650134979e347b2b7bd2112523eaac664a32a02c0e68b5983050749713e461
+  data.tar.gz: 4ee220fe6f7a93a0533a11ff15489fb61da7a32d2131367c3ee1f32d7a697e4daea501f61767baff26b93baf8d433c9f4ad8bd2a069ed1539bbf549498635877

data/lib/instapusher/commands.rb

@@ -5,23 +5,23 @@ require 'uri'
 module Instapusher
   class Commands
 
-    attr_reader :debug, :api_key, :branch_name, :project_name, :staging
+    attr_reader :debug, :api_key, :branch_name, :project_name, :staging, :local
 
     def initialize init_options
       @debug = init_options[:debug]
       @staging = init_options[:staging]
       @local = init_options[:local]
+      @branch_name  = get_branch_name
+      @project_name = get_project_name
 
-      git          = Git.new
-      @branch_name  = init_options[:project_name] || ENV['INSTAPUSHER_BRANCH'] || git.current_branch
-      @project_name = init_options[:branch_name] || ENV['INSTAPUSHER_PROJECT'] || git.project_name
+      detect_api_key
     end
 
     def deploy
       verify_api_key
       #SpecialInstructionForProduction.new.run if production?
 
-      job_submission = JobSubmission.new(debug, options)
+      job_submission = JobSubmission.new(debug, job_submission_parameters)
       job_submission.submit_the_job
 
       if job_submission.success?
@@ -34,28 +34,32 @@ module Instapusher
 
     private
 
-    def options
-      @options ||= begin
+    def job_submission_parameters
         { project: project_name,
-          local: @local,
+          local: local,
           branch:  branch_name,
-          owner: Git.new.repo_owner,
+          owner: repo_owner,
           version: VERSION,
-          staging: @staging,
+          staging: staging,
           api_key: api_key }
-      end
     end
 
-    def verify_api_key
-      @api_key = ENV['API_KEY'] || Instapusher::Configuration.api_key(debug) || ""
-      puts "api_key is #{@api_key}" if debug
+    def repo_owner
+      git.repo_owner
+    end
 
+    def verify_api_key
       if @api_key.to_s.length == 0
         puts ''
         abort "No instapusher API key was found. Please execute instapusher --api-key to setup instapusher API key."
       end
     end
 
+    def detect_api_key
+      @api_key = ENV['API_KEY'] || Instapusher::Configuration.api_key(debug) || ""
+      log "api_key is #{@api_key}"
+    end
+
     def production?
       branch_name.intern == :production
     end
@@ -64,5 +68,21 @@ module Instapusher
       branch_name.intern == :staging
     end
 
+    def log msg
+      puts msg if debug
+    end
+
+    def get_branch_name
+      ENV['INSTAPUSHER_BRANCH'] || git.current_branch
+    end
+
+    def get_project_name
+      ENV['INSTAPUSHER_PROJECT'] || git.project_name
+    end
+
+    def git
+      @_git ||= Git.new
+    end
+
   end
 end

data/lib/instapusher/version.rb

@@ -1,3 +1,3 @@
 module Instapusher
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instapusher
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Neeraj Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr