houston-core 0.7.0 → 0.8.0.pre

data/lib/houston/boot.rb

@@ -6,4 +6,3 @@ require "houston/boot/events"
 
 require "houston/boot/active_record_serializer"
 require "houston/boot/readonly_hash_serializer"
-require "houston/boot/ticket_antecedent_serializer"

data/lib/houston/boot/configuration.rb

@@ -24,6 +24,11 @@ module_function
 
     def initialize
       @root = Rails.root
+      @roles = {}
+      @roles["Team Owner"] = Proc.new do |team|
+        can :manage, team
+        can :manage, Project, team_id: team.id
+      end
       @modules = []
       @gems = []
       @ticket_types = {}
@@ -170,18 +175,12 @@ module_function
       @environments ||= []
     end
 
-    def roles(*args)
-      @roles = args if args.any?
-      ["Guest"] + (@roles ||= [])
-    end
-
-    def default_role
-      "Guest"
+    def roles
+      @roles.keys
     end
 
-    def project_roles(*args)
-      @project_roles = args if args.any?
-      ["Follower"] + (@project_roles ||= [])
+    def role(role_name, &abilities_block)
+      @roles[role_name] = abilities_block
     end
 
     def ticket_types(*args)
@@ -224,7 +223,16 @@ module_function
 
     def authentication_strategy(strategy=nil, &block)
       @authentication_strategy = strategy if strategy
-      @authentication_strategy_configuration = HashDsl.hash_from_block(block) if block_given?
+      if block_given?
+        @authentication_strategy_configuration = HashDsl.hash_from_block(block)
+
+        if authentication_strategy == :ldap
+          %i{host port base field username_builder}.each do |required_field|
+            next if @authentication_strategy_configuration.key?(required_field)
+            raise "#{required_field} is a required field for :ldap authentication"
+          end
+        end
+      end
 
       @authentication_strategy
     end
@@ -269,6 +277,13 @@ module_function
       context.instance_exec(user, &@abilities_block)
     end
 
+    def configure_team_abilities(context, teammate)
+      teammate.roles.each do |role|
+        abilities_block = @roles.fetch(role)
+        context.instance_exec(teammate.team, &abilities_block)
+      end
+    end
+
 
 
 

data/lib/houston/boot/events.rb

@@ -1,9 +1,5 @@
 Houston.register_events {{
 
-  "antecedent:{type}:released"      => params("antecedent").desc("A ticket or commit with an antecedent of {type} was released"),
-  "antecedent:{type}:resolved"      => params("antecedent").desc("A ticket with an antecedent of {type} was resolved"),
-  "antecedent:{type}:closed"        => params("antecedent").desc("A ticket with an antecedent of {type} was closed"),
-
   "commit:create"                   => params("commit").desc("A new commit was created"),
 
   "daemon:{type}:start"             => desc("Daemon {type} has started"),

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "0.7.0"
+  VERSION = "0.8.0.pre"
 end

data/templates/new-instance/config/abilities.rb

@@ -1,73 +1,90 @@
 # This block uses the DSL defined by CanCan.
 # https://github.com/ryanb/cancan/wiki/Defining-Abilities
 
-Houston.config.abilities do |user|
-  if user.nil?
+Houston.config do
 
-    # Customers are allowed to see Release Notes of products, for production
-    can :read, Release do |release|
-      release.project.category == "Products" && (release.environment_name.blank? || release.environment_name == "production")
-    end
 
-    # Customers are allowed to see Features, Improvements, and Bugfixes
-    can :read, ReleaseChange, tag_slug: %w{feature improvement fix}
+  role "Maintainer" do |team|
 
-  else
+    # Maintainers can create releases
+    can :manage, Release, project_id: team.project_ids
 
-    # Everyone can see Releases to staging
-    can :read, Release
+    # Maintainers can change projects' settings
+    can :update, Project, id: team.project_ids
 
-    # Everyone is allowed to see Features, Improvements, and Bugfixes
-    can :read, ReleaseChange, tag_slug: %w{feature improvement fix}
+  end
 
-    # Everyone can see Projects
-    can :read, Project
 
-    # Everyone can see Tickets
-    can :read, Ticket
+  role "Developer" do |team|
 
-    # Everyone can see Milestones
-    can :read, Milestone
+    # Developers can see commits and can manage
+    # tickets, pull requests, and alerts
+    can :read, Commit, project_id: team.project_ids
+    can :update_tickets, Milestone, project_id: team.project_ids
+    can :manage, Task, project_id: team.project_ids
+    can :create, Ticket, project_id: team.project_ids
+    can :close, Ticket, project_id: team.project_ids
+    can :manage, Github::PullRequest, project_id: team.project_ids
+    can :manage, Houston::Alerts::Alert, project_id: team.project_ids
+    can :manage, Sprint
 
-    # Everyone can see Users and update themselves
-    can :read, User
-    can :update, user
+  end
 
-    # Everyone can make themselves a "Follower"
-    can :create, Role, name: "Follower"
 
-    # Everyone can remove themselves from a role
-    can :destroy, Role, user_id: user.id
+  role "Tester" do |team|
 
-    # Developers can
-    #  - create tickets
-    #  - see other kinds of Release Changes (like Refactors)
-    #  - update Sprints
-    #  - break tickets into tasks
-    if user.developer?
-      can :read, [Commit, ReleaseChange]
-      can :manage, Sprint
-      can :manage, Task
-    end
+    # Testers can create tickets and be assigned Alerts
+    can :create, Ticket, project_id: team.project_ids
+    can :manage, Houston::Alerts::Alert, project_id: team.project_ids
 
-    # Testers and Developers can
-    #  - create tickets
-    #  - see and manage alerts
-    if user.tester? or user.developer?
-      can :create, Ticket
-      can :manage, Houston::Alerts::Alert
-    end
+  end
 
-    # The following abilities are project-specific and depend on one's role
-    roles = user.roles.participants
-    if roles.any?
 
-      # Maintainers can manage Releases, close Tickets, and update Projects
-      roles.maintainers.pluck(:project_id).tap do |project_ids|
-        can :manage, Release, project_id: project_ids
-        can :close, Ticket, project_id: project_ids
-        can :update, Project, id: project_ids
+  abilities do |user|
+    if user.nil?
+
+      # Customers are allowed to see Release Notes of products, for production
+      can :read, Release do |release|
+        release.environment_name == "production"
       end
+
+    else
+
+      if user.admin?
+
+        # Admins can see Actions
+        can :read, Action
+
+      end
+
+      # Employees can see Teams
+      can :read, Team
+
+      # Employees can see Releases to staging
+      can :read, Release
+
+      # Employees can see Projects
+      can :read, Project
+
+      # Employees can see Tickets
+      can :read, Ticket
+
+      # Employees can see Roadmaps
+      can :read, Roadmap
+      can :read, Milestone
+
+      # Employees can see Users and update themselves
+      can :read, User
+      can :update, user
+
+      # Employees can read and tag and create feedback
+      can :read, Houston::Feedback::Comment
+      can :tag, Houston::Feedback::Comment
+      can :create, Houston::Feedback::Comment
+
+      # Employees can update their own feedback
+      can [:update, :destroy], Houston::Feedback::Comment, user_id: user.id
+
     end
   end
 end

data/templates/new-instance/config/conversations/mentions/unfurl_tasks.rb

@@ -1,6 +1,6 @@
 Houston::Slack.config do
   overhear(/\b(?<task>\d+[a-z]+)\b/) do |e|
-    next unless e.user && e.user.developer?
+    next unless e.user
     tasks = Task.joins(:ticket)
 
     if project = e.channel.name != "test" && Project.find_by_slug(e.channel.name)

data/templates/new-instance/config/events/deploy/notify_deployer_when_finished.rb

@@ -1,23 +1,31 @@
 Houston.config do
-  on "deploy:completed" => "deploy:slack-deployer-of-finished-deploy" do
-    next if deploy.build_releasignore?
+  on "deploy:succeeded" => "deploy:slack-deployer-of-finished-deploy" do
+    next if deploy.build_release.ignore?
+    next unless deployer = deploy.user
 
-    deployer = deploy.user
-    if deployer
-      message = "#{deployer.first_name}, your deploy of #{deploy.project.slug} " <<
-                "to #{deploy.environment_name} just finished. " <<
-                slack_link_to("Click here to write release notes",
-                  Rails.application.routes.url_helpers.new_release_url(
-                    deploy.project.to_param,
-                    deploy.environment_name,
-                    host: Houston.config.host,
-                    deploy_id: deploy.id,
-                    auth_token: deployer.authentication_token))
-      slack_send_message_to message, deployer
+    message = "#{deployer.first_name}, your deploy of #{deploy.project.slug} " <<
+              "to #{deploy.environment_name} just finished. " <<
+              slack_link_to("Click here to write release notes",
+                Rails.application.routes.url_helpers.new_release_url(
+                  deploy.project.to_param,
+                  deploy.environment_name,
+                  host: Houston.config.host,
+                  deploy_id: deploy.id,
+                  auth_token: deployer.authentication_token))
+    slack_send_message_to message, deployer
+  end
+
+  on "deploy:succeeded" => "deploy:email-deployer-of-finished-deploy" do
+    next if deploy.build_release.ignore?
+
+    maintainers = deploy.project.maintainers
+    maintainers.each do |maintainer|
+      Houston.deliver! ProjectNotification.maintainer_of_deploy(maintainer, deploy)
     end
 
-    Houston.try({max_tries: 3}, Net::OpenTimeout) do
-      DeployNotification.new(deploy).deliver! # <-- after extracting releases, move this to Releases
+    deployer = deploy.deployer
+    if !deployer.blank? && !maintainers.with_email_address(deployer).exists?
+      Houston.deliver! ProjectNotification.maintainer_of_deploy(deployer, deploy)
     end
   end
 end

data/templates/new-instance/config/events/tests/email_when_completed.rb

@@ -0,0 +1,11 @@
+Houston.config do
+  on "test_run:complete" => "test_run:email-results" do
+    project = test_run.project
+    committers = test_run.commits_since_last_test_run.map { |commit| commit.author_email.downcase }
+    recipients = (committers + Array(test_run.agent_email)).uniq \
+               - project.maintainers.map(&:email) \
+               + project.maintainers
+
+    Houston.deliver! ProjectNotification.test_results(test_run, recipients)
+  end
+end

data/templates/new-instance/config/integrations/ldap.rb

@@ -1,5 +1,9 @@
 # Houston.config.authentication_strategy :ldap do
+#   instructions "You can log in with your corporate username and password"
 #   host "10.5.3.100"
 #   port 636
 #   ssl :simple_tls
+#   base "dc=cph, dc=pri"
+#   field "samaccountname"
+#   username_builder Proc.new { |attribute, login, ldap| "#{login}@cph.pri" }
 # end

data/templates/new-instance/config/main.rb

@@ -177,10 +177,13 @@ Houston.config do
   #   bundle config local.houston-<MODULE> ~/Projects/houston-<MODULE>
   #
 
+  use :feedback
+  use :roadmaps
+
   use :alerts do
 
-    # Who can be assign an Alert?
-    workers { User.developers }
+    # Who can be assigned an Alert?
+    workers { User.unretired }
 
     # Set a target-time for the Alert to be closed.
     # This block sets a goal of closing alerts within
@@ -211,23 +214,13 @@ Houston.config do
   # Roles and Abilities
   # ---------------------------------------------------------------------------
   #
-  # Every user will have one Role. You can refer to a user's roles when you
-  # define her abilities. Houston will add the role "Guest" to this list.
-  # "Guest" is the default role.
+  # A user may belong to one or more teams. Within each team, a user can be
+  # given one or more team-specific roles. Define those roles — and the abilities
+  # they grant below.
   #
-  # NOTE: Presently, Houston requires that "Tester" be one of these roles.
-
-  roles "Developer",
-        "Tester"
-
-  # Users additionally have any number of project-specific roles. You can
-  # refer to these as well when configuring abilities.
+  # Houston adds the "Team Owner" role which will be given the ability to manage
+  # teams and their projects.
   #
-  # NOTE: Presently, Houston requires that "Maintainer" be one of these.
-
-  project_roles "Maintainer",
-                "Owner"
-
   # Houston uses CanCan to check authorize users to do particular actions.
   # Houston will pass a user to the block defined below which should declare
   # what abilities that user has.

data/templates/new-module/test/fixtures/users.yml

@@ -4,7 +4,6 @@ admin:
   email: admin@example.com
   email_addresses:
   - admin@example.com
-  administrator: true
-  role: Developer
+  role: Owner
   encrypted_password: $2a$10$Pf9Q94yN7t/YGqGS6pBl5uOL8lUvqgWpGeXRMHGbgPU0ixbWzthOG
 # password: password

data/test/acceptance/creating_a_release_test.rb

@@ -12,12 +12,12 @@ class CreatingAReleaseTest < ActionDispatch::IntegrationTest
 
     @user = User.first
     @project = Project.create!(
+      team: Team.first,
       name: "Test",
       slug: "test",
       ticket_tracker_name: "Houston",
       version_control_name: "Git",
       props:  {"git.location" => Rails.root.join("test", "data", "bare_repo.git").to_s})
-    @project.roles.create!(name: "Maintainer", user: user)
     @ticket = @project.tickets.create!(
       number: 116,
       type: "Bug",

data/test/factories/project_factory.rb

@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :project do
+    team { Team.first }
     name "Test"
     slug "test"
   end

data/test/factories/user_factory.rb

@@ -8,6 +8,8 @@ FactoryGirl.define do
   end
 
   factory :developer, :parent => :user do
-    role "Developer"
+    after(:create) do |user|
+      Team.first.add_teammate user, "Developer"
+    end
   end
 end

data/test/fixtures/teams.yml

@@ -0,0 +1,2 @@
+default:
+  name: "Default Team"

data/test/fixtures/teams_users.yml

@@ -0,0 +1,5 @@
+teams_users_1:
+  team: default
+  user: boblail
+  roles:
+    - Team Owner

data/test/fixtures/users.yml

@@ -4,7 +4,6 @@ boblail:
   email: bob@example.com
   email_addresses:
   - bob@example.com
-  administrator: true
-  role: Developer
+  role: Owner
   encrypted_password: $2a$10$Pf9Q94yN7t/YGqGS6pBl5uOL8lUvqgWpGeXRMHGbgPU0ixbWzthOG
 # password: password

data/test/integration/ci_integration_test.rb

@@ -32,7 +32,7 @@ class CIIntegrationTest < ActionDispatch::IntegrationTest
     should "alert maintainers when a build cannot be triggered" do
       skip "TMI: This is dependent on configured roles!"
       @project = create(:project, ci_server_name: "Mock")
-      project.add_teammate users(:boblail)
+      project.team.add_teammate users(:boblail)
 
       any_instance_of(Houston::Adapters::CIServer::MockAdapter::Job) do |job|
         stub(job).build! { |commit| raise Houston::Adapters::CIServer::Error }
@@ -71,7 +71,7 @@ class CIIntegrationTest < ActionDispatch::IntegrationTest
       commit = "whatever"
       results_url = "http://example.com/results"
       @project = create(:project, ci_server_name: "Mock")
-      project.add_teammate users(:boblail)
+      project.team.add_teammate users(:boblail)
       @test_run = TestRun.create!(project: project, sha: commit)
 
       any_instance_of(Houston::Adapters::CIServer::MockAdapter::Job) do |job|

data/test/support/config.rb

@@ -2,11 +2,9 @@ Houston.config do
   host "houston.test.com"
   mailer_sender "houston@test.com"
 
-  # TODO: The Sprints feature requires there to be a "Developer" role
-  roles "Developer", "Tester"
-
-  # TODO: Some tests require the role "Maintainer" to be defined
-  project_roles "Maintainer"
+  role "Developer" do |team|
+    can :manage, Sprint
+  end
 
   # TODO: without ticket_types configured, tests that cover them should be skipped
   ticket_types({