caperoma 4.0.1 → 5.0.0

data/spec/models/task_with_commit_spec.rb

@@ -7,10 +7,6 @@ RSpec.describe TaskWithCommit, type: :model do
     it { expect(subject).to be_a_kind_of Task }
   end
 
-  describe 'relations' do
-    it { expect(subject).to belong_to :branch }
-  end
-
   describe 'methods' do
     describe '#finish' do
       let!(:task) { create :task_with_commit }

data/spec/models/task_with_separate_branch_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe TaskWithSeparateBranch, type: :model do
         allow_any_instance_of(TaskWithSeparateBranch).to receive(:description_for_pull_request).and_return 'pivotal-url'
         allow_any_instance_of(TaskWithSeparateBranch).to receive(:git_current_branch).and_return 'parent-branch'
 
-        expect(task).to receive(:git_pull_request).with('parent-branch', 'title', 'pivotal-url')
+        expect(task).to receive(:git_pull_request)
         expect(task).to receive(:git_checkout).with('parent-branch')
 
         task.finish(nil)
@@ -23,7 +23,7 @@ RSpec.describe TaskWithSeparateBranch, type: :model do
 
       it 'should commit with generated message' do
         allow_any_instance_of(TaskWithSeparateBranch).to receive(:description_for_pull_request).and_return 'pivotal-url'
-        expect(task).not_to receive(:git_pull_request).with('parent-branch', 'title', 'pivotal-url')
+        expect(task).not_to receive(:git_pull_request)
         expect(task).not_to receive(:git_checkout).with('parent-branch')
 
         task.pause(nil)
@@ -65,10 +65,10 @@ RSpec.describe TaskWithSeparateBranch, type: :model do
       end
     end
 
-    describe '::new_git_branch' do
+    describe '::git_branch' do
       it 'should make a new branch' do
         expect_any_instance_of(TaskWithSeparateBranch).to receive(:branch_name).and_return 'branch-name'
-        expect_any_instance_of(TaskWithSeparateBranch).to receive(:git_branch).with('branch-name')
+        expect_any_instance_of(TaskWithSeparateBranch).to receive(:git_branch)
 
         create :task_with_separate_branch
       end

data/spec/models/three_day_report_spec.rb

@@ -37,13 +37,12 @@ RSpec.describe ThreeDayReport, type: :model do
 
     describe 'message body', :unstub_puts do
       let(:report) { create :three_day_report }
-      let!(:task1) { create :task, jira_key: 'DOV-2', pivotal_id: 2345678, three_day_report: nil, finished_at: 2.days.ago }
-      let!(:task2) { create :task, jira_key: 'MOB-8', pivotal_id: 2345674, three_day_report: nil, finished_at: 1.day.ago }
+      let!(:task1) { create :task, jira_key: 'DOV-2', pivotal_id: 2_345_678, three_day_report: nil, finished_at: 2.days.ago }
+      let!(:task2) { create :task, jira_key: 'MOB-8', pivotal_id: 2_345_674, three_day_report: nil, finished_at: 1.day.ago }
 
       specify do
         expect(report.send(:report_body)).to match /table/
       end
-
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ ENV['CAPEROMA_TEST'] = 'true'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib', 'models'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib', 'models', 'tasks'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib', 'models', 'tasks', 'modules'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'caperoma'

data/spec/support/capefile_generator.rb

@@ -1,36 +1,44 @@
 # frozen_string_literal: true
+
 require 'yaml'
 
-CAPEFILE_SAMPLE_DATA = {
-  'github_repo' => 'owner/repo',
-  'jira_url' => 'https://owner.atlassian.net/',
-  'jira_project_id' => 10001,
-  'jira_issue_type_ids' => {
-    'feature' => 10101,
-    'bug' => 10103,
-    'chore' => 10100,
-    'fix' => 10101,
-    'meeting' => 10100,
-  },
-  'jira_transition_ids' => {
-    'todo' => 11,
-    'in_progress' => 21,
-    'done' => 31,
-  },
-  'pivotal_tracker_project_id' => 2374972,
-  'create_features_in_pivotal' => true,
-  'create_bugs_in_pivotal' => true,
-  'create_chores_in_pivotal' => true,
-  'create_fixes_in_pivotal_as_chores' => false,
-  'create_meetings_in_pivotal_as_chores' => false
-}
+def create_capefile(jira_project_id = 12_345)
+  capefile_sample_data = {
+    'github_repo' => 'owner/repo',
+    'jira_url' => 'https://owner.atlassian.net/',
+    'jira_project_id' => 10_001,
+    'jira_issue_type_ids' => {
+      'feature' => 10_101,
+      'bug' => 10_103,
+      'chore' => 10_100,
+      'fix' => 10_101,
+      'meeting' => 10_100
+    },
+    'jira_transition_ids' => {
+      'todo' => 11,
+      'in_progress' => 21,
+      'done' => 31
+    },
+    'pivotal_tracker_project_id' => 2_374_972,
+    'create_features_in_pivotal' => true,
+    'create_bugs_in_pivotal' => true,
+    'create_chores_in_pivotal' => true,
+    'create_fixes_in_pivotal_as_chores' => false,
+    'create_meetings_in_pivotal_as_chores' => false
+  }
+  capefile_sample_data['jira_project_id'] = jira_project_id
+  yaml = capefile_sample_data.to_yaml
+  File.write 'Capefile.test', yaml
+end
 
-def create_capefile(jira_project_id)
-  CAPEFILE_SAMPLE_DATA['jira_project_id'] = jira_project_id
-  yaml = CAPEFILE_SAMPLE_DATA.to_yaml
+def create_incomplete_capefile
+  capefile_sample_data = {
+    'github_repo' => 'owner/repo'
+  }
+  yaml = capefile_sample_data.to_yaml
   File.write 'Capefile.test', yaml
 end
 
 def remove_capefile
-  File.delete 'Capefile.test'
+  File.delete 'Capefile.test' if File.exist? 'Capefile.test'
 end

data/spec/support/stubs.rb

@@ -66,87 +66,20 @@ end
 
 RSpec.configure do |config|
   config.before do |example|
-    # if example.metadata[:unstab_capefile].blank?
-    #   Caperoma::Capefile::JIRA_URL = '123'
-    # end
-
-    # if example.metadata[:unstub_git].blank?
-    #   allow_any_instance_of(Feature).to receive(:git_branch)
-    #   allow_any_instance_of(Feature).to receive(:git_commit)
-    #   allow_any_instance_of(Feature).to receive(:git_push)
-    #   allow_any_instance_of(Feature).to receive(:git_last_commit_name).and_return 'some commit'
-    #   allow_any_instance_of(Feature).to receive(:git_current_branch).and_return 'parent-branch'
-    #   allow_any_instance_of(Feature).to receive(:git_pull_request)
-    #   allow_any_instance_of(Feature).to receive(:git_checkout)
-
-    #   allow_any_instance_of(Bug).to receive(:git_branch)
-    #   allow_any_instance_of(Bug).to receive(:git_commit)
-    #   allow_any_instance_of(Bug).to receive(:git_push)
-    #   allow_any_instance_of(Bug).to receive(:git_last_commit_name).and_return 'some commit'
-    #   allow_any_instance_of(Bug).to receive(:git_current_branch).and_return 'parent-branch'
-    #   allow_any_instance_of(Bug).to receive(:git_pull_request)
-    #   allow_any_instance_of(Bug).to receive(:git_checkout)
-
-    #   allow_any_instance_of(Chore).to receive(:git_branch)
-    #   allow_any_instance_of(Chore).to receive(:git_commit)
-    #   allow_any_instance_of(Chore).to receive(:git_push)
-    #   allow_any_instance_of(Chore).to receive(:git_last_commit_name).and_return 'some commit'
-    #   allow_any_instance_of(Chore).to receive(:git_current_branch).and_return 'parent-branch'
-    #   allow_any_instance_of(Chore).to receive(:git_pull_request)
-    #   allow_any_instance_of(Chore).to receive(:git_checkout)
-
-    #   allow_any_instance_of(Fix).to receive(:git_branch)
-    #   allow_any_instance_of(Fix).to receive(:git_commit)
-    #   allow_any_instance_of(Fix).to receive(:git_push)
-    #   allow_any_instance_of(Fix).to receive(:git_last_commit_name).and_return 'some commit'
-    #   allow_any_instance_of(Fix).to receive(:git_current_branch).and_return 'parent-branch'
-    #   allow_any_instance_of(Fix).to receive(:git_pull_request)
-    #   allow_any_instance_of(Fix).to receive(:git_checkout)
-
-    #   allow_any_instance_of(Meeting).to receive(:git_branch)
-    #   allow_any_instance_of(Meeting).to receive(:git_commit)
-    #   allow_any_instance_of(Meeting).to receive(:git_push)
-    #   allow_any_instance_of(Meeting).to receive(:git_last_commit_name).and_return 'some commit'
-    #   allow_any_instance_of(Meeting).to receive(:git_current_branch).and_return 'parent-branch'
-    #   allow_any_instance_of(Meeting).to receive(:git_pull_request)
-    #   allow_any_instance_of(Meeting).to receive(:git_checkout)
-
-    #   allow_any_instance_of(Task).to receive(:git_branch)
-    #   allow_any_instance_of(Task).to receive(:git_commit)
-    #   allow_any_instance_of(Task).to receive(:git_push)
-    #   allow_any_instance_of(Task).to receive(:git_last_commit_name).and_return 'some commit'
-    #   allow_any_instance_of(Task).to receive(:git_current_branch).and_return 'parent-branch'
-    #   allow_any_instance_of(Task).to receive(:git_pull_request)
-    #   allow_any_instance_of(Task).to receive(:git_checkout)
-
-    #   allow_any_instance_of(TaskWithSeparateBranch).to receive(:git_branch)
-    #   allow_any_instance_of(TaskWithSeparateBranch).to receive(:git_commit)
-    #   allow_any_instance_of(TaskWithSeparateBranch).to receive(:git_push)
-    #   allow_any_instance_of(TaskWithSeparateBranch).to receive(:git_last_commit_name).and_return 'some commit'
-    #   allow_any_instance_of(TaskWithSeparateBranch).to receive(:git_current_branch).and_return 'parent-branch'
-    #   allow_any_instance_of(TaskWithSeparateBranch).to receive(:git_pull_request)
-    #   allow_any_instance_of(TaskWithSeparateBranch).to receive(:git_checkout)
-
-    #   allow_any_instance_of(TaskWithCommit).to receive(:git_branch)
-    #   allow_any_instance_of(TaskWithCommit).to receive(:git_commit)
-    #   allow_any_instance_of(TaskWithCommit).to receive(:git_push)
-    #   allow_any_instance_of(TaskWithCommit).to receive(:git_last_commit_name).and_return 'some commit'
-    #   allow_any_instance_of(TaskWithCommit).to receive(:git_current_branch).and_return 'parent-branch'
-    #   allow_any_instance_of(TaskWithCommit).to receive(:git_pull_request)
-    #   allow_any_instance_of(TaskWithCommit).to receive(:git_checkout)
-    # end
-
     if example.metadata[:unstub_reports].blank?
       allow_any_instance_of(Report).to receive(:send_email)
     end
 
     if example.metadata[:unstab_api_calls].blank?
-      faraday = spy('faraday')
+      response = double('Faraday', body: JIRA_ISSUE_CREATION_RESPONSE, status: 200)
+      faraday = double('Faraday', post: response)
+
       allow(Faraday).to receive(:new).and_return faraday
       allow(Faraday).to receive(:default_adapter)
-      allow(faraday).to receive(:get)
-      allow(faraday).to receive(:post)
-      allow(faraday).to receive(:put)
+
+      allow(faraday).to receive(:post).and_return response
+      allow(faraday).to receive(:get).and_return response
+      allow(faraday).to receive(:put).and_return response
     end
 
     allow(STDOUT).to receive(:puts) if example.metadata[:unstub_puts].blank?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caperoma
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Serge Vinogradoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: whenever
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -193,19 +207,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 4.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -276,18 +290,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-description: "    Caperoma automates many decisions related to the programming that
-  you often don't realize, and which you can forget hundreds of times during the time
-  of working on the project: \n    - pulling the latest code from upstream before
-  you start working,\n    - remembering from which branch you started the feature
-  to later make a pull request into it,\n    - creating & starting tasks in Jira,\n
-  \   - creating & starting tasks in Pivotal,\n    - naming branches,\n    - adding
-  Jira ID into the branch name,\n    - style guide checks,\n    - commits,\n    -
-  naming commits,\n    - adding Jira ID into commit name,\n    - adding Pivotal ID
-  into commit name,\n    - git pushes,\n    - pull requests into correct branches,\n
-  \   - stopping tasks in Jira,\n    - stopping tasks in Pivotal,\n    - tracking
-  time,\n    - logging time to Jira,\n    - switching back into the original branch
-  and much more.\n"
+description: |2
+      Caperoma automates many decisions related to the programming that you often don't realize, and which you can forget hundreds of times during the time of working on the project:
+      pulling the latest code from upstream before you start working,
+      remembering from which branch you started the feature to later make a pull request into it,
+      creating & starting tasks in Jira,
+      creating & starting tasks in Pivotal,
+      naming branches,
+      adding Jira ID into the branch name,
+      style guide checks,
+      commits,
+      naming commits,
+      adding Jira ID into commit name,
+      adding Pivotal ID into commit name,
+      git pushes,
+      pull requests into correct branches,
+      stopping tasks in Jira,
+      stopping tasks in Pivotal,
+      tracking time,
+      logging time to Jira,
+      switching back into the original branch and much more.
 email: sergevinogradoff.caperoma@gmail.com
 executables:
 - caperoma
@@ -311,10 +333,12 @@ files:
 - caperoma.gemspec
 - config/crontab
 - config/schedule.rb
+- config/unschedule.rb
+- images/circle.png
+- images/report.png
 - lib/caperoma.rb
 - lib/caperoma/models/account.rb
 - lib/caperoma/models/application_record.rb
-- lib/caperoma/models/branch.rb
 - lib/caperoma/models/project.rb
 - lib/caperoma/models/property.rb
 - lib/caperoma/models/report.rb
@@ -331,12 +355,9 @@ files:
 - lib/caperoma/models/tasks/modules/git.rb
 - lib/caperoma/models/tasks/task_with_commit.rb
 - lib/caperoma/models/tasks/task_with_separate_branch.rb
-- lib/caperoma/services/airbrake_email_processor.rb
-- lib/caperoma/services/pivotal_fetcher.rb
 - lib/caperoma/version.rb
 - spec/caperoma_spec.rb
 - spec/factories/accounts.rb
-- spec/factories/branches.rb
 - spec/factories/projects.rb
 - spec/factories/report_recipients.rb
 - spec/factories/reports.rb
@@ -348,6 +369,7 @@ files:
 - spec/features/feature_spec.rb
 - spec/features/finish_spec.rb
 - spec/features/fix_spec.rb
+- spec/features/init_spec.rb
 - spec/features/meeting_spec.rb
 - spec/features/projects_spec.rb
 - spec/features/report_recipientss_spec.rb
@@ -355,7 +377,6 @@ files:
 - spec/features/status_spec.rb
 - spec/features/version_spec.rb
 - spec/models/account_spec.rb
-- spec/models/branch_spec.rb
 - spec/models/bug_spec.rb
 - spec/models/chore_spec.rb
 - spec/models/daily_report_spec.rb
@@ -394,8 +415,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- sqlite
-- git
+- Ruby 2.4 or higher
+- SQLite
+- Git
+- Crontab
 rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4

data/lib/caperoma/models/branch.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-class Branch < ActiveRecord::Base
-  belongs_to :project
-  has_many :tasks
-end

data/lib/caperoma/services/airbrake_email_processor.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-class AirbrakeEmailProcessor
-  # stub for test env
-  def process
-    account = Account.gmail
-    Gmail.new(account.email, account.password) do |gmail|
-      gmail.inbox.emails(:unread, from: 'donotreply@alerts.airbrake.io').select { |email| email.subject.include? '[Ruck.us]' }.each do |email|
-        # get reply address
-        reply_to = "#{email.to.first.mailbox}@#{email.to.first.host}"
-
-        # generate reply body
-        body = ''
-
-        story = PivotalFetcher.get_story_by_title(email.subject)
-        if story.present? && story.respond_to?(:url)
-          body = "Duplicate of: #{story.url}"
-        else
-          story = PivotalFetcher.create_story(email.subject, email.body.raw_source[0..1000])
-          body = "Created new story: #{story.url}"
-        end
-
-        # compose reply email (to get identifiers)
-        reply = email.reply do
-          subject "Re: #{email.subject}"
-          body    body
-        end
-
-        # bugfix to make reply work
-        new_email = gmail.compose do
-          to          reply_to # note it's generated email, not airbrake one
-          subject     reply.subject
-          in_reply_to reply.in_reply_to
-          references  reply.references
-          body        reply.body.raw_source
-        end
-
-        # deliver reply
-        new_email.deliver!
-
-        # archive email
-        email.mark(:read)
-        email.archive!
-      end
-    end
-  end
-end

data/lib/caperoma/services/pivotal_fetcher.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-class PivotalFetcher
-  def self.process(story_id)
-    story = get_story(story_id)
-
-    if story.present?
-      title = story.name
-      description = story.description
-      type = story.story_type
-      # labels = story.labels # in case I do Critical thing
-      # something liek if lables.include?("hot") pass "critical" status to Jira.
-
-      story.update(current_state: 'started', owned_by: 'Serge Vinogradoff')
-
-      args = [type, title, description, story_id] # or args = [type, title, description, "1", story_id] ? I use that 1 in older versions
-      case type
-      when 'feature'
-        Caperoma.feature(args)
-      when 'bug'
-        Caperoma.bug(args)
-      else
-        puts 'Unknown story type in Pivotal'
-      end
-
-      # copy Jira ID to Pivotal story
-      task = Task.where(pivotal_id: story_id).first
-      if task.present?
-        task.jira_key
-        story.notes.create(text: task.jira_key)
-      else
-        puts 'task does not exist'
-      end
-    else
-      puts 'Did not find a story'
-    end
-  end
-
-  def self.finish(story_id)
-    story = nil
-
-    PivotalTracker::Project.all.each do |project|
-      story = project.stories.find(story_id)
-      break if story.present?
-    end
-
-    story
-
-    if story.present? && story.tasks.all.empty?
-      story.update current_state: 'finished'
-    end
-  end
-
-  def self.create_story(title, description)
-    connect
-
-    project_id = 993_892
-
-    # this isn't needed anymore... these are PT ID's of Ruck.us.
-    if title.include? '[Ruck.us] Production '
-      project_id = 993_892
-    elsif title.include? '[Ruck.us] Staging '
-      project_id = 1_110_744
-    elsif title.include? '[Ruck.us] Staging2 '
-      project_id = 1_266_704
-    end
-
-    # TODO: icebox, need probably to move to backlog
-    project = PivotalTracker::Project.find(project_id)
-    story = project.stories.create name: title,
-                                   description: description,
-                                   requested_by: 'Serge Vinogradoff',
-                                   owned_by: 'Serge Vinogradoff',
-                                   story_type: 'bug'
-
-    story
-  end
-
-  def self.get_story_by_title(title)
-    connect
-
-    story = nil
-
-    PivotalTracker::Project.all.each do |project|
-      story = project.stories.all.select { |x| x.name == title }.first
-      break if story.present?
-    end
-
-    story
-  end
-
-  def self.get_story(story_id)
-    connect
-
-    story = nil
-
-    PivotalTracker::Project.all.each do |project|
-      story = project.stories.find(story_id)
-      break if story.present?
-    end
-
-    story
-  end
-
-  def self.connect
-    PivotalTracker::Client.token(Account.pivotal.email, Account.pivotal.password)
-  end
-end