git_reflow 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b04665f9b041b4458192a789b097f5c455f5322
-  data.tar.gz: e1f40457e04fdf6f3e0f6876bdbd00ed2983f5b7
+  metadata.gz: d71fb145146965402e35a8781270d335c6b48992
+  data.tar.gz: 021a46ce6f44072e351fc58dc926a6f86d6bb8e9
 SHA512:
-  metadata.gz: 90869eb8058b2de453b8790520daf94e5d47ae63010b05cf1065c2590c3ff2138774b58360708d399a91cfac9527eeb71454b0d838a7ad001e5ee30ca6e2e797
-  data.tar.gz: 93640654d91e1e1c1d23be975c15df7346a42df35c044e02e444917d8f059b788cb4eeee7536ffd8cacaa46d9384ba8e9f98d54b92d175eb1ae9c21304bc7331
+  metadata.gz: 00e25a1a163fbe53bf386608f825d5c4e598ab38769ef2d38776326a6b6abd3a506c5db72d09d5524fd5d01cae7235554353d5b85824bba188217cb2933f37c5
+  data.tar.gz: 8657729034fa0cbdbc6f573b7571f002b9740ac9d3a322bff3fa0863eab55b0f1e57e56d842d1ae2641a21409408817e2360f4caa018620837d00d0fbf2b50e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.7.0)
+    git_reflow (0.7.1)
       colorize (>= 0.7.0)
       github_api (= 0.12.4)
       gli (= 2.13.2)
@@ -30,7 +30,7 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.2)
       faraday (>= 0.7.4, < 0.10)

data/lib/git_reflow/commands/stage.rb

@@ -0,0 +1,31 @@
+desc 'Deliver your changes to a staging server'
+command :stage do |c|
+  c.desc 'deliver your feature branch to the staging branch'
+  c.action do |global_options, options, args|
+    feature_branch_name = GitReflow.current_branch
+    staging_branch_name = GitReflow::Config.get('reflow.staging-branch', local: true)
+
+    if staging_branch_name.empty?
+      staging_branch_name = GitReflow.ask("What's the name of your staging branch? (default: 'staging') ")
+      staging_branch_name = 'staging' if staging_branch_name.strip == ''
+      GitReflow::Config.set('reflow.staging-branch', staging_branch_name, local: true)
+    end
+
+    GitReflow.run_command_with_label "git checkout #{staging_branch_name}"
+    GitReflow.run_command_with_label "git pull origin #{staging_branch_name}"
+
+    if GitReflow.run_command_with_label "git merge #{feature_branch_name}", with_system: true
+      GitReflow.run_command_with_label "git push origin #{staging_branch_name}"
+
+      staged = GitReflow.deploy(:staging)
+
+      if staged
+        GitReflow.say "Deployed to Staging.", :success
+      else
+        GitReflow.say "There were issues deploying to staging.", :error
+      end
+    else
+      GitReflow.say "There were issues merging your feature branch to staging.", :error
+    end
+  end
+end

data/lib/git_reflow/sandbox.rb

@@ -39,7 +39,7 @@ module GitReflow
 
     # WARNING: this currently only supports OS X and UBUNTU
     def ask_to_open_in_browser(url)
-      if OS.linux?
+      if OS.unix?
         open_in_browser = ask "Would you like to open it in your browser? "
         if open_in_browser =~ /^y/i
           if OS.mac?

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/git_reflow.rb

@@ -130,6 +130,24 @@ module GitReflow
     end
   end
 
+  def deploy(destination_server)
+    deploy_command = GitReflow::Config.get("reflow.deploy-to-#{destination_server}-command", local: true)
+
+    # first check is to allow for automated setup
+    if deploy_command.empty?
+      deploy_command = ask("Enter the command you use to deploy to #{destination_server} (leaving blank will skip deployment)")
+    end
+
+    # second check is to see if the user wants to skip
+    if deploy_command.empty?
+      say "Skipping deployment..."
+      false
+    else
+      GitReflow::Config.set("reflow.deploy-to-#{destination_server}-command", deploy_command, local: true)
+      run_command_with_label(deploy_command, with_system: true)
+    end
+  end
+
   def git_server
     @git_server ||= GitServer.connect provider: GitReflow::Config.get('reflow.git-server').strip, silent: true
   end

data/spec/git_reflow_spec.rb

@@ -416,4 +416,41 @@ describe GitReflow do
       end
     end
   end
+
+  context ".deploy(destination)" do
+    let(:deploy_command) { "bundle exec cap #{destination} deploy" }
+    subject              { GitReflow.deploy(destination) }
+
+    before do
+      stub_command_line_inputs({
+        "Enter the command you use to deploy to #{destination} (leaving blank will skip deployment)" => "bundle exec cap #{destination} deploy"
+      })
+    end
+
+    context "staging" do
+      let(:destination) { "staging" }
+
+      it "sets the local git-config for reflow.deploy-to-staging-command" do
+        expect(GitReflow::Config).to receive(:set).with('reflow.deploy-to-staging-command', deploy_command, local: true)
+        subject
+      end
+
+      it "runs the staging deploy command" do
+        expect { subject }.to have_run_command(deploy_command)
+      end
+    end
+
+    context "production" do
+      let(:destination) { "production" }
+
+      it "sets the local git-config for reflow.deploy-to-staging-command" do
+        expect(GitReflow::Config).to receive(:set).with('reflow.deploy-to-production-command', deploy_command, local: true)
+        subject
+      end
+
+      it "runs the staging deploy command" do
+        expect { subject }.to have_run_command(deploy_command)
+      end
+    end
+  end
 end

data/spec/support/fake_github.rb

@@ -113,7 +113,7 @@ class FakeGitHub
                                       repo_name:           self.repo_name,
                                       comments:            object_data[:comments],
                                       pull_request_number: object_data[:number] || 1,
-                                      created_at:          object_data[:created_at] || Time.now).to_s,
+                                      created_at:          object_data[:created_at] || Time.parse('1pm')).to_s,
                     status: 201,
                     headers: {content_type: "application/json; charset=utf-8"})
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -262,6 +262,7 @@ files:
 - lib/git_reflow/commands/deliver.rb
 - lib/git_reflow/commands/review.rb
 - lib/git_reflow/commands/setup.rb
+- lib/git_reflow/commands/stage.rb
 - lib/git_reflow/commands/start.rb
 - lib/git_reflow/commands/status.rb
 - lib/git_reflow/config.rb