employ 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeadbb4732872f3d7dc5ed43a7bc9f0b2b285067
-  data.tar.gz: a8a167ae6f01ead9c865ab92663ac34b98ae9b62
+  metadata.gz: 3dc87824621c83b35500def738b1fab0388c7dc5
+  data.tar.gz: 09dfe2abe2f44b5ca2af3131d0c6abfd8514a23d
 SHA512:
-  metadata.gz: 3b98277258da300930df1836900b8e78bd9a72a87e120b70e2cdea9dd8243e8d4cd7cb627e7280c1df22d9b116dbb543b282c9cfc97c84253edf6197600401b2
-  data.tar.gz: c040f1c054009bb13bad29d2ee93cd04250fe2950c1ad1401bf5f66970ce237664665a2eeab686bfb304a74d07d2a421d0aeda088dc1bbc44c4d9ea25ab956ea
+  metadata.gz: 6ac3735f0a50a051101de246eb3cdb59662a3cf417f9dd8cab8a89e59a01c774cabec921951852778109fa89687ff6707d675997b758b7159c1edc7388f5064b
+  data.tar.gz: e34c62bf62fc1299bf002bb5758467f4579ab3c661d29f4e457d0c42528d08f221aaeec0a62351a603b62ac5a306f8a95260799354c4d5ce190d8b43cfe0fd81

data/bin/employ

@@ -5,6 +5,4 @@ require 'rubygems' unless defined?(Gem)
 require 'bundler/setup'
 Bundler.require
 
-require File.join(File.expand_path(__FILE__), '../lib/employ')
-
 Employ::CLI.start ARGV

data/employ.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'octokit'
   spec.add_dependency 'colorize'
   spec.add_dependency 'thor'
+  spec.add_dependency 'pry'
 end

data/lib/employ.rb

@@ -1,4 +1,7 @@
 require 'thor'
+require 'colorize'
+require 'octokit'
+require 'pry'
 
 require 'employ/version'
 require 'employ/git'

data/lib/employ/cli.rb

@@ -1,10 +1,35 @@
-require 'employ/cli/promote'
-
 module Employ
   class CLI < Thor
-    class_option :verbose, type: :boolean
+    class_option :verbose, type: :boolean, aliases: :v
+
+    class_option 'assume-yes', type: :boolean, aliases: %w(y yes),
+      desc: 'Automatic yes to prompts'
+
+    desc 'promote <env>', 'promotes commit to <env>'
+    long_desc "TODO"
+    option :interactive, type: :boolean, aliases: :i
+    def promote(env)
+      unless options['assume-yes'] || yes?('Are you sure?')
+        puts 'Nothing done. Bye!'
+        exit 1
+      end
+
+      if options[:interactive]
+        last_tag = Git.last_tag(env)
+        puts "last tag: #{last_tag}" if options[:verbose]
+        # TODO
+      else
+        name = Git.tag!(env)
+        puts "New tag promoted: #{name}" if options[:verbose]
+      end
+    end
 
-    include Employ::CLI::Promote
+    desc 'rollback <env>', 'rollbacks <env> tag to the penultimate one'
+    long_desc "TODO"
+    def rollback(env)
+      penultimate_tag = Git.penultimate_tag(env)
+      Git.retag! env, penultimate_tag
+    end
 
   end
 end

data/lib/employ/git.rb

@@ -3,8 +3,10 @@ module Employ
     extend self
 
     def tag!(env, tag = nil)
-      name = "#{env}-#{Time.now.to_i}"
-      `git tag #{name} #{tag} && git push --tags`
+      name = "#{env}-#{Time.now.strftime('%Y%m%dT%H%M%S')}"
+      `git tag #{name} #{tag}`
+      `git push --tags`
+      name
     end
 
     def retag!(env, tag)

data/lib/employ/version.rb

@@ -1,3 +1,3 @@
 module Employ
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: employ
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Victor Rodrigues
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Github development workflow
 email:
 - victorc.rodrigues@gmail.com
@@ -98,8 +112,6 @@ files:
 - lib/employ.rb
 - lib/employ/change.rb
 - lib/employ/cli.rb
-- lib/employ/cli/promote.rb
-- lib/employ/cli/rollback.rb
 - lib/employ/git.rb
 - lib/employ/version.rb
 homepage: http://github.com/rodrigues/employ

data/lib/employ/cli/promote.rb

@@ -1,24 +0,0 @@
-module Employ
-  class CLI < Thor
-    module Promote
-
-      desc 'promote <env>', 'promotes commit to <env>'
-
-      long_desc <<-DESC
-
-      DESC
-
-      option :interactive, type: :boolean, aliases: :i
-
-      def promote(env)
-        if options[:interactive]
-          last_tag = Git.last_tag(env)
-
-        else
-          Git.tag! env
-        end
-      end
-
-    end
-  end
-end

data/lib/employ/cli/rollback.rb

@@ -1,18 +0,0 @@
-module Employ
-  class CLI < Thor
-    module Rollback
-
-      desc 'rollback <env>', 'rollbacks <env> tag to the penultimate one'
-
-      long_desc <<-DESC
-
-      DESC
-
-      def rollback(env)
-        penultimate_tag = Git.penultimate_tag(env)
-        Git.retag! env, penultimate_tag
-      end
-
-    end
-  end
-end