coconductor 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e480557237f7498e2cecde80b375f469b43450cd8a0f08716b01c702937cf44
-  data.tar.gz: 595ae0238808432fe4938b5de8c91bbe46abb08b88772de85f89b7df16c2fea7
+  metadata.gz: e05bf7d17d5b42745715db08f27e650150208b03e7452318a0d6ba8a5008faf2
+  data.tar.gz: e7009c3ef47dacd37d622400dc9ed2aba6c1793aebd920d8fa09a0733e903c48
 SHA512:
-  metadata.gz: 728e46aa91c2991ae07a2a1d48b14069d65c2d9f8026d962611713da775b677c0d71e4b4fa44cbfba02c949243b745e69507ad860b6cfb114b7bfc4fffaf0af8
-  data.tar.gz: b188e52329adf3b0b18c0153f64b3d9ee4d5797effba0877db38fe606812c21bb2c49595a3b461abe59bbe7944ce23f9fe5bd4ad5a49b87e770150dd7501ab87
+  metadata.gz: 4097f1aa8b661ef6da3f7fe76f65c3150c1f17a42353a2548b70201a4378f8cd2f7763b6e71e9eed0bfc8ace2ecac8f97096118228dfb00a8ba485bac6cb4d2c
+  data.tar.gz: ec97081a9d6a67e508a1c64b5ac5ac88cbdee226f2d6446959658ec149a0e5fb3802a47fa91264ff827dd8ddcd56a877be0412ce29c68ba95daf453893e9b728

data/.rubocop.yml

@@ -4,6 +4,7 @@ Style/Documentation:
 Metrics/BlockLength:
   Exclude:
     - spec/**/*
+    - coconductor.gemspec
 
 Metrics/LineLength:
   Exclude:

data/coconductor.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
       f.match(%r{^(test|spec|features)/})
     end
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = 'bin'
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_dependency 'licensee', '~> 9.9', '>= 9.9.4'
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'reverse_markdown', '~> 1.1'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.50'
   spec.add_development_dependency 'webmock', '~> 3.1'

data/lib/coconductor.rb

@@ -1,4 +1,4 @@
-require 'coconductor/version'
+require_relative './coconductor/version'
 require 'licensee'
 
 module Coconductor
@@ -7,6 +7,7 @@ module Coconductor
   autoload :Matchers,      'coconductor/matchers'
   autoload :Projects,      'coconductor/projects'
   autoload :ProjectFiles,  'coconductor/project_files'
+  autoload :Vendorer,      'coconductor/vendorer'
 
   CONFIDENCE_THRESHOLD = 90
 

data/lib/coconductor/code_of_conduct.rb

@@ -16,6 +16,7 @@ module Coconductor
       # or the latest in the family if only the family is specified
       def find(key_or_family)
         return new(key_or_family) if new(key_or_family).pseudo?
+
         match = all.find { |coc| coc.key == key_or_family }
         match || latest_in_family(key_or_family)
       end
@@ -32,6 +33,7 @@ module Coconductor
           key = path.relative_path_from(vendor_dir)
           matches = KEY_REGEX.match(key.to_path)
           next unless matches
+
           [
             matches['family'], 'version', matches['version'], matches['lang']
           ].compact.join('/')
@@ -46,8 +48,9 @@ module Coconductor
       end
 
       def families
-        @families ||= Dir["#{vendor_dir}/*"].map do |dir|
-          File.basename(dir)
+        @families ||= begin
+          families = Dir["#{vendor_dir}/*"].map { |dir| File.basename(dir) }
+          families - ['bundle']
         end
       end
 
@@ -103,6 +106,7 @@ module Coconductor
 
     def name
       return @name if defined? @name
+
       @name = name_without_version.dup
       @name << " (#{language.upcase})" unless default_language?
       @name << " v#{version}" if version
@@ -177,6 +181,7 @@ module Coconductor
 
     def filepath
       return @filepath if defined? @filepath
+
       parts = key.split('/')
       parts.pop unless default_language?
       path = File.join(*parts[0...5], filename)
@@ -187,6 +192,7 @@ module Coconductor
     # Raw content of code of conduct file, including TOML front matter
     def raw_content
       return if pseudo?
+
       unless File.exist?(filepath)
         msg = "'#{key}' is not a valid code of conduct key"
         raise Coconductor::InvalidCodeOfConduct, msg

data/lib/coconductor/commands/detect.rb

@@ -30,6 +30,7 @@ class CoconductorCLI < Thor
     print_table rows
 
     return unless code_of_conduct_file && (options[:code_of_conduct] || options[:diff])
+
     expected_code_of_conduct = options[:code_of_conduct] || closest_code_of_conduct
     return unless expected_code_of_conduct
 
@@ -42,6 +43,7 @@ class CoconductorCLI < Thor
 
   def closest_code_of_conduct
     return unless code_of_conduct_file
+
     matcher = Coconductor::Matchers::Dice.new(code_of_conduct_file)
     matches = matcher.matches_by_similarity
     matches.first.first.key unless matches.empty?

data/lib/coconductor/field.rb

@@ -61,6 +61,7 @@ module Coconductor
     def description
       @description ||= begin
         return parts[:description] if parts && parts[:description] != ''
+
         DESCRIPTIONS[key]
       end
     end

data/lib/coconductor/matchers/field_aware.rb

@@ -5,6 +5,7 @@ module Coconductor
 
       def match
         return @match if defined? @match
+
         potential_matches.find do |code_of_conduct|
           file.content_normalized =~ regex_for(code_of_conduct)
         end

data/lib/coconductor/projects/git_project.rb

@@ -11,10 +11,12 @@ module Coconductor
       #  :oid  - the file's OID
       def files
         return @files if defined? @files
+
         @files = files_from_tree(commit.tree)
 
         commit.tree.each_tree do |tree_hash|
           next unless subdir?(tree_hash)
+
           tree = Rugged::Tree.lookup(@repository, tree_hash[:oid])
           @files.concat files_from_tree(tree, tree_hash[:name]) if tree
         end

data/lib/coconductor/vendorer.rb

@@ -0,0 +1,124 @@
+require 'fileutils'
+require 'open-uri'
+require 'toml'
+require 'reverse_markdown'
+require 'logger'
+
+# Used in development to vendor codes of conduct
+module Coconductor
+  class Vendorer
+    attr_reader :family, :repo
+    attr_writer :ref, :raw_content
+
+    OPTIONS = %i[filename url repo replacements html source_path].freeze
+    INVALID_CHARS = ["\u202D", "\u202C", "\u200E", "\u200F"].freeze
+    UPPERCASE_WORD_REGEX = /(?:[A-Z]{3,}+ ?)+[A-Z_]+/
+    UNMARKED_FIELD_REGEX = /(?<= |^)#{UPPERCASE_WORD_REGEX}(?= |\.|,)/
+
+    def initialize(family, options = {})
+      @family = family
+
+      OPTIONS.each do |option|
+        instance_variable_set("@#{option}", options[option])
+      end
+
+      logger.info "Vendoring #{family}"
+
+      mkdir
+    end
+
+    def dir
+      @dir ||= File.expand_path family, vendor_dir
+    end
+
+    def filename
+      @filename ||= 'CODE_OF_CONDUCT.md'
+    end
+
+    def source_path
+      @source_path ||= filename
+    end
+
+    def content
+      content_normalized
+    end
+
+    def url
+      @url || "https://github.com/#{repo}/raw/#{ref}/#{source_path}"
+    end
+
+    def vendor(version: '1.0')
+      write_with_meta(content, version: version)
+    end
+
+    def ref
+      @ref ||= 'master'
+    end
+
+    def replacements
+      @replacements ||= {}
+    end
+
+    def write_with_meta(content, version: '1.0')
+      content = content_with_meta(content, 'version' => version)
+      write(filepath(version), content)
+    end
+
+    private
+
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
+
+    def vendor_dir
+      @vendor_dir ||= File.expand_path '../../vendor', __dir__
+    end
+
+    def filepath(version = '1.0')
+      File.join(dir, 'version', *version.split('.'), filename)
+    end
+
+    def content_with_meta(content, meta)
+      toml = TOML::Generator.new(meta).body.strip
+      ['+++', toml, '+++', '', content].join("\n")
+    end
+
+    def mkdir
+      FileUtils.rm_rf(dir)
+      FileUtils.mkdir_p(dir)
+    end
+
+    def write(path, content)
+      logger.info "Writing #{path}"
+      FileUtils.mkdir_p File.dirname(path)
+      File.write(path, content)
+    end
+
+    def raw_content
+      return @raw_content if defined? @raw_content
+
+      logger.info "Retrieving #{url}"
+      URI.open(url).read if url
+    end
+
+    def content_normalized
+      content = raw_content.dup.gsub(Regexp.union(INVALID_CHARS), '')
+      content = ReverseMarkdown.convert content if html?
+      replacements.each { |from, to| content.gsub!(from, to) }
+      content = normalize_implicit_fields(content)
+      content.gsub!(/ ?{% .* %} ?/, '')
+      content.squeeze(' ').strip
+    end
+
+    def normalize_implicit_fields(content)
+      content.gsub!(/#{UPPERCASE_WORD_REGEX} #{UPPERCASE_WORD_REGEX}/) do |m|
+        m.tr(' ', '_')
+      end
+      content.gsub(UNMARKED_FIELD_REGEX) { |m| "[#{m}]" }
+    end
+
+    def html?
+      @html == true
+    end
+  end
+end

data/lib/coconductor/version.rb

@@ -1,3 +1,3 @@
 module Coconductor
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

data/script/vendor-codes-of-conduct

@@ -1,73 +1,54 @@
 #!/usr/bin/env ruby
 
-require 'fileutils'
-require 'open-uri'
-require 'toml'
-
-def mkdir(dir)
-  FileUtils.rm_rf(dir)
-  FileUtils.mkdir_p(dir)
-end
-
-def write_with_meta(content, version: '1.0', dir: '', file: 'CODE_OF_CONDUCT.md')
-  meta = { 'version' => version }
-  toml = TOML::Generator.new(meta).body.strip
-  content = ['+++', toml, '+++', '', content].join("\n")
-  path = File.join(dir, 'version', *version.split('.'), file)
-  FileUtils.mkdir_p File.dirname(path)
-  File.write(path, content)
-end
-
-def download_and_write(url, version: '1.0', dir: '', file: 'CODE_OF_CONDUCT.md')
-  content = URI.open(url).read
-  write_with_meta(content, version: version, dir: dir, file: file)
-end
+require_relative '../lib/coconductor'
 
+# Contributor Covenant
 repo = 'ContributorCovenant/contributor_covenant'
-dir = File.expand_path '../vendor/contributor-covenant', __dir__
-include_path = '*/content/version'
-
-mkdir(dir)
-
-tar_args = "--include=#{include_path} --strip-components=2 -C #{dir}"
+vendorer = Coconductor::Vendorer.new('contributor-covenant', filename: 'code-of-conduct.md')
+tar_args = "--include='*/content/version' --strip-components=2 -C #{vendorer.dir}"
 `curl -L "https://api.github.com/repos/#{repo}/tarball" | tar xf - #{tar_args}`
+Dir["#{vendorer.dir}/version/**/#{vendorer.filename}"].each do |path|
+  vendorer.raw_content = File.read(path)
+  File.write(path, vendorer.content)
+end
 
+# Citizen Code of Conduct
 repo = 'stumpsyn/policies'
-dir = File.expand_path '../vendor/citizen-code-of-conduct', __dir__
-file = 'citizen_code_of_conduct.md'
+filename = 'citizen_code_of_conduct.md'
+vendorer = Coconductor::Vendorer.new('citizen-code-of-conduct', repo: repo, filename: filename)
 versions = {
   '2.0' => 'd0594789ea324a42e26b495034952b6ce08d9f51',
   '2.1' => 'b7705a4315a5e58fea58ae3d4b1de82bd564ac86',
   '2.2' => '93b7b06f52c9dd526d2395bfa9f5f1723deae32a',
   '2.3' => 'b1eb8deb5da073c2bd02a8e742e017edfc422554'
 }
-
-mkdir(dir)
-
 versions.each do |version, sha|
-  url = "https://github.com/#{repo}/raw/#{sha}/#{file}"
-  download_and_write(url, version: version, dir: dir, file: file)
+  vendorer.ref = sha
+  vendorer.vendor(version: version)
 end
 
-repo = 'domgetter/NCoC'
-dir = 'vendor/no-code-of-conduct'
-file = 'CODE_OF_CONDUCT.md'
-
-mkdir(dir)
-
-url = "https://github.com/#{repo}/raw/master/#{file}"
-download_and_write(url, dir: dir, file: file)
-
-dir = 'vendor/geek-feminism'
-file = 'CODE_OF_CONDUCT.md'
+# No Code of Conduct
+Coconductor::Vendorer.new('no-code-of-conduct', repo: 'domgetter/NCoC').vendor
+
+# Django
+Coconductor::Vendorer.new('django',
+                          repo: 'django/djangoproject.com',
+                          source_path: 'djangoproject/templates/conduct/index.html',
+                          html: true,
+                          replacements: {
+                            'Django Software Foundation' => '[GOVERNING_BODY]',
+                            'Django' => '[COMMUNITY_NAME]',
+                            'conduct@djangoproject.com' => '[EMAIL_ADDRESS]',
+                            "{% url 'conduct_reporting' %}" => '[LINK_TO_REPORTING_GUIDELINES]',
+                            "{% url 'conduct_faq' %}" => '[LINK_TO_FAQ]'
+                          }).vendor
+
+# Geek Feminism
 url = 'http://geekfeminism.wikia.com/wiki/Community_anti-harassment/Policy?action=edit'
-
-content = URI.open(url).read
-content = content.split('==Anti-harassment policy text==')[1]
+vendorer = Coconductor::Vendorer.new('geek-feminism', url: url)
+content = vendorer.content.split('==Anti-harassment policy text==')[1]
 content = content.split('</textarea').first
-content = content.gsub(/(?:[A-Z]{3,}+ ?)+[A-Z]+/) { |m| "[#{m.tr(' ', '_')}]" }
 versions = content.split('===Longer version===')
 versions = versions.map { |v| v.gsub('===Shorter version===', '').strip }
-
-write_with_meta(versions.first, version: 'shorter', dir: dir, file: file)
-write_with_meta(versions.last, version: 'longer', dir: dir, file: file)
+vendorer.write_with_meta(versions.first, version: 'shorter')
+vendorer.write_with_meta(versions.last, version: 'longer')

data/vendor/citizen-code-of-conduct/version/2/0/citizen_code_of_conduct.md

@@ -4,124 +4,124 @@ version = "2.0"
 
 # Citizen Code of Conduct
 
-## 1.‭ ‬Purpose
+## 1. Purpose
 
-A‭ ‬primary‭ ‬goal‭ ‬of‭ ‬COMMUNITY‭_‬NAME‭ ‬is‭ ‬to‭ ‬be‭ ‬inclusive‭ ‬to‭
-‬the‭ ‬largest‭ ‬number‭ ‬of‭ ‬contributors,‭ ‬with‭ ‬the‭ ‬most‭ ‬varied‭
-‬and‭ ‬diverse‭ ‬backgrounds‭ ‬possible.‭ ‬As‭ ‬such,‭ ‬we‭ ‬are‭ ‬committed‭
-‬to‭ ‬providing‭ ‬a‭ ‬friendly,‭ ‬safe‭ ‬and‭ ‬welcoming‭ ‬environment‭ ‬for‭
-‬all,‭ ‬regardless‭ ‬of‭ ‬gender,‭ ‬sexual‭ ‬orientation,‭ ‬ability,‭
-‬ethnicity,‭ ‬socioeconomic‭ ‬status,‭ ‬and‭ ‬religion‭ (‬or‭ ‬lack‭
-‬thereof‭)‬.‭
+A primary goal of [COMMUNITY_NAME] is to be inclusive to
+the largest number of contributors, with the most varied
+and diverse backgrounds possible. As such, we are committed
+to providing a friendly, safe and welcoming environment for
+all, regardless of gender, sexual orientation, ability,
+ethnicity, socioeconomic status, and religion (or lack
+thereof).
 
-This‭ ‬code‭ ‬of‭ ‬conduct‭ ‬outlines‭ ‬our‭ ‬expectations‭ ‬for‭ ‬all‭
-‬those‭ ‬who‭ ‬participate‭ ‬in‭ ‬our‭ ‬community,‭ ‬as‭ ‬well‭ ‬as‭ ‬the‭
-‬consequences‭ ‬for‭ ‬unacceptable‭ ‬behavior.
+This code of conduct outlines our expectations for all
+those who participate in our community, as well as the
+consequences for unacceptable behavior.
 
-We‭ ‬invite‭ ‬all‭ ‬those‭ ‬who‭ ‬participate‭ ‬in‭ ‬COMMUNITY‭_‬NAME‭ ‬to‭
-‬help‭ ‬us‭ ‬create‭ ‬safe‭ ‬and‭ ‬positive‭ ‬experiences‭ ‬for‭ ‬everyone.
+We invite all those who participate in [COMMUNITY_NAME] to
+help us create safe and positive experiences for everyone.
 
-## 2.‎ ‏Open‭ [‬Source/Culture/Tech‭] ‬Citizenship
+## 2. Open [Source/Culture/Tech] Citizenship
 
-A‭ ‬supplemental‭ ‬goal‭ ‬of‭ ‬this‭ ‬Code‭ ‬of‭ ‬Conduct‭ ‬is‭ ‬to‭
-‬increase‭ ‬open‭ [‬source/culture‭/tech] ‬citizenship‭ ‬by‭ ‬encouraging‭
-‬participants‭ ‬to‭ ‬recognize‭ ‬and‭ ‬strengthen‭ ‬the‭ ‬relationships‭
-‬between‭ ‬our‭ ‬actions‭ ‬and‭ ‬their‭ ‬effects‭ ‬on‭ ‬our‭ ‬community.
+A supplemental goal of this Code of Conduct is to
+increase open [source/culture/tech] citizenship by encouraging
+participants to recognize and strengthen the relationships
+between our actions and their effects on our community.
 
 Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
 
-If‭ ‬you‭ ‬see‭ ‬someone‭ ‬who‭ ‬is‭ ‬making‭ ‬an‭ ‬extra‭ ‬effort‭ ‬to‭
-‬ensure‭ ‬our‭ ‬community‭ ‬is‭ ‬welcoming,‭ ‬friendly,‭ ‬and‭ ‬encourages‭
-‬all‭ ‬participants‭ ‬to‭ ‬contribute‭ ‬to‭ ‬the‭ ‬fullest‭ ‬extent,‭ ‬we‭
-‬want‭ ‬to‭ ‬know.
+If you see someone who is making an extra effort to
+ensure our community is welcoming, friendly, and encourages
+all participants to contribute to the fullest extent, we
+want to know.
 
-## 3.‎ ‏Expected‭ ‬Behavior
+## 3. Expected Behavior
 
-  * Participate‭ ‬in‭ ‬an‭ ‬authentic‭ ‬and‭ ‬active‭ ‬way.‭ ‬In‭ ‬doing‭ ‬so,‭ ‬you‭ ‬contribute‭ ‬to‭ ‬the‭ ‬health‭ ‬and‭ ‬longevity‭ ‬of‭ ‬this‭ ‬community.
-  * Exercise‭ ‬consideration‭ ‬and‭ ‬respect‭ ‬in‭ ‬your‭ ‬speech‭ ‬and‭ ‬actions.
-  * Attempt‭ ‬collaboration‭ ‬before‭ ‬conflict.
-  * Refrain‭ ‬from‭ ‬demeaning,‭ ‬discriminatory,‭ ‬or‭ ‬harassing‭ ‬behavior‭ ‬and‭ ‬speech.
-  * Be‭ ‬mindful‭ ‬of‭ ‬your‭ ‬surroundings‭ ‬and‭ ‬of‭ ‬your‭ ‬fellow‭ ‬participants.‭ ‬Alert‭ ‬community‭ ‬leaders‭ ‬if‭ ‬you‭ ‬notice‭ ‬a‭ ‬dangerous‭ ‬situation,‭ ‬someone‭ ‬in‭ ‬distress,‭ ‬or‭ ‬violations‭ ‬of‭ ‬this‭ ‬Code‭ ‬of‭ ‬Conduct,‭ ‬even‭ ‬if‭ ‬they‭ ‬seem‭ ‬inconsequential.
+ * Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+ * Exercise consideration and respect in your speech and actions.
+ * Attempt collaboration before conflict.
+ * Refrain from demeaning, discriminatory, or harassing behavior and speech.
+ * Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
 
-## 4.‎ ‏Unacceptable‭ ‬Behavior
+## 4. Unacceptable Behavior
 
-Unacceptable‭ ‬behaviors‭ ‬include:‭ ‬intimidating,‭ ‬harassing,‭ ‬abusive,‭
-‬discriminatory,‭ ‬derogatory‭ ‬or‭ ‬demeaning‭ ‬speech‭ ‬or‭ ‬actions‭ ‬by‭
-‬any‭ ‬participant‭ ‬in‭ ‬our‭ ‬community‭ ‬online,‭ ‬at‭ ‬all‭ ‬related‭
-‬events‭ ‬and‭ ‬in‭ ‬one-on-one‭ ‬communications‭ ‬carried‭ ‬out‭ ‬in‭ ‬the‭
-‬context‭ ‬of‭ ‬community‭ ‬business.‭ ‬Community‭ ‬event‭ ‬venues‭ ‬may‭ ‬be‭
-‬shared‭ ‬with‭ ‬members‭ ‬of‭ ‬the‭ ‬public‭; ‬please‭ ‬be‭ ‬respectful‭ ‬to‭
-‬all‭ ‬patrons‭ ‬of‭ ‬these‭ ‬locations.
+Unacceptable behaviors include: intimidating, harassing, abusive,
+discriminatory, derogatory or demeaning speech or actions by
+any participant in our community online, at all related
+events and in one-on-one communications carried out in the
+context of community business. Community event venues may be
+shared with members of the public; please be respectful to
+all patrons of these locations.
 
-Harassment‭ ‬includes:‭ ‬harmful‭ ‬or‭ ‬prejudicial‭ ‬verbal‭ ‬or‭ ‬written‭
-‬comments‭ ‬related‭ ‬to‭ ‬gender,‭ ‬sexual‭ ‬orientation,‭ ‬race,‭
-‬religion,‭ ‬disability‭; ‬inappropriate‭ ‬use‭ ‬of‭ ‬nudity‭ ‬and/or‭
-‬sexual‭ ‬images‭ ‬in‭ ‬public‭ ‬spaces‭ (‬including‭ ‬presentation‭
-‬slides‭); ‬deliberate‭ ‬intimidation,‭ ‬stalking‭ ‬or‭ ‬following‭;
-‬harassing‭ ‬photography‭ ‬or‭ ‬recording‭; ‬sustained‭ ‬disruption‭ ‬of‭
-‬talks‭ ‬or‭ ‬other‭ ‬events‭; ‬inappropriate‭ ‬physical‭ ‬contact,‭ ‬and‭
-‬unwelcome‭ ‬sexual‭ ‬attention.
+Harassment includes: harmful or prejudicial verbal or written
+comments related to gender, sexual orientation, race,
+religion, disability; inappropriate use of nudity and/or
+sexual images in public spaces (including presentation
+slides); deliberate intimidation, stalking or following;
+harassing photography or recording; sustained disruption of
+talks or other events; inappropriate physical contact, and
+unwelcome sexual attention.
 
-## 5.‎ ‏Consequences‭ ‬of‭ ‬Unacceptable‭ ‬Behavior
+## 5. Consequences of Unacceptable Behavior
 
-Unacceptable‭ ‬behavior‭ ‬from‭ ‬any‭ ‬community‭ ‬member,‭ ‬including‭
-‬sponsors‭ ‬and‭ ‬those‭ ‬with‭ ‬decision-making‭ ‬authority,‭ ‬will‭ ‬not‭
-‬be‭ ‬tolerated.
+Unacceptable behavior from any community member, including
+sponsors and those with decision-making authority, will not
+be tolerated.
 
-Anyone‭ ‬asked‭ ‬to‭ ‬stop‭ ‬unacceptable‭ ‬behavior‭ ‬is‭ ‬expected‭ ‬to‭
-‬comply‭ ‬immediately.
+Anyone asked to stop unacceptable behavior is expected to
+comply immediately.
 
-If‭ ‬a‭ ‬community‭ ‬member‭ ‬engages‭ ‬in‭ ‬unacceptable‭ ‬behavior,‭ ‬the‭
-‬community‭ ‬organizers‭ ‬may‭ ‬take‭ ‬any‭ ‬action‭ ‬they‭ ‬deem‭
-‬appropriate,‭ ‬up‭ ‬to‭ ‬and‭ ‬including‭ ‬a‭ ‬temporary‭ ‬ban‭ ‬or‭
-‬permanent‭ ‬expulsion‭ ‬from‭ ‬the‭ ‬community‭ ‬without‭ ‬warning‭ (‬and‭
-‬without‭ ‬refund‭ ‬in‭ ‬the‭ ‬case‭ ‬of‭ ‬a‭ ‬paid‭ ‬event‭)‬.
+If a community member engages in unacceptable behavior, the
+community organizers may take any action they deem
+appropriate, up to and including a temporary ban or
+permanent expulsion from the community without warning (and
+without refund in the case of a paid event).
 
-## 6.‎ ‏If‭ ‬You‭ ‬Witness‭ ‬or‭ ‬Are‭ ‬Subject‭ ‬to‭ ‬Unacceptable‭ ‬Behavior
+## 6. If You Witness or Are Subject to Unacceptable Behavior
 
-If‭ ‬you‭ ‬are‭ ‬subject‭ ‬to‭ ‬or‭ ‬witness‭ ‬unacceptable‭ ‬behavior,‭ ‬or‭
-‬have‭ ‬any‭ ‬other‭ ‬concerns,‭ ‬please‭ ‬notify‭ ‬a‭ ‬community‭ ‬organizer‭
-‬as‭ ‬soon‭ ‬as‭ ‬possible.‭ [‬CONTACT‭_‬INFO‭_‬HERE‭]
+If you are subject to or witness unacceptable behavior, or
+have any other concerns, please notify a community organizer
+as soon as possible. [CONTACT_INFO_HERE]
 
-Additionally,‭ ‬community‭ ‬organizers‭ ‬are‭ ‬available‭ ‬to‭ ‬help‭
-‬community‭ ‬members‭ ‬engage‭ ‬with‭ ‬local‭ ‬law‭ ‬enforcement‭ ‬or‭ ‬to‭
-‬otherwise‭ ‬help‭ ‬those‭ ‬experiencing‭ ‬unacceptable‭ ‬behavior‭ ‬feel‭
-‬safe.‭ ‬In‭ ‬the‭ ‬context‭ ‬of‭ ‬in-person‭ ‬events,‭ ‬organizers‭ ‬will‭
-‬also‭ ‬provide‭ ‬escorts‭ ‬as‭ ‬desired‭ ‬by‭ ‬the‭ ‬person‭ ‬experiencing‭
-‬distress.
+Additionally, community organizers are available to help
+community members engage with local law enforcement or to
+otherwise help those experiencing unacceptable behavior feel
+safe. In the context of in-person events, organizers will
+also provide escorts as desired by the person experiencing
+distress.
 
-## 7.‎ ‏Addressing‭ ‬Grievances
+## 7. Addressing Grievances
 
-If‭ ‬you‭ ‬feel‭ ‬you‭ ‬have‭ ‬been‭ ‬falsely‭ ‬or‭ ‬unfairly‭ ‬accused‭ ‬of‭
-‬violating‭ ‬this‭ ‬Code‭ ‬of‭ ‬Conduct,‭ ‬you‭ ‬should‭ ‬notify‭
-‬GOVERNING‭_‬BODY‭ ‬with‭ ‬a‭ ‬concise‭ ‬description‭ ‬of‭ ‬your‭ ‬grievance.‭
-‬Your‭ ‬grievance‭ ‬will‭ ‬be‭ ‬handled‭ ‬in‭ ‬accordance‭ ‬with‭ ‬our‭
-‬existing‭ ‬governing‭ ‬policies.‭ [‬LINK‭_‬TO‭_‬POLICY‭]
+If you feel you have been falsely or unfairly accused of
+violating this Code of Conduct, you should notify
+[GOVERNING_BODY] with a concise description of your grievance.
+Your grievance will be handled in accordance with our
+existing governing policies. [LINK_TO_POLICY]
 
-[NOTE:‎ ‏Every‭ ‬organization‭'‬s‭ ‬governing‭ ‬policies‭ ‬should‭ ‬dictate‭
-‬how‭ ‬you‭ ‬handle‭ ‬warnings‭ ‬and‭ ‬expulsions‭ ‬of‭ ‬community‭ ‬members.‭
-‬It‭ ‬is‭ ‬strongly‭ ‬recommended‭ ‬that‭ ‬you‭ ‬mention‭ ‬those‭ ‬policies‭
-‬here‭ ‬or‭ ‬in‭ ‬Section‭ ‬7‭ ‬and‭ ‬that‭ ‬you‭ ‬include‭ ‬a‭ ‬mechanism‭
-‬for‭ ‬addressing‭ ‬grievances.‭]
+[NOTE: Every organization's governing policies should dictate
+how you handle warnings and expulsions of community members.
+It is strongly recommended that you mention those policies
+here or in Section 7 and that you include a mechanism
+for addressing grievances.]
 
-## 8.‎ ‏Scope
+## 8. Scope
 
-We‭ ‬expect‭ ‬all‭ ‬community‭ ‬participants‭ (‬contributors,‭ ‬paid‭ ‬or‭
-‬otherwise‭; ‬sponsors‭; ‬and‭ ‬other‭ ‬guests‭) ‬to‭ ‬abide‭ ‬by‭ ‬this‭
-‬Code‭ ‬of‭ ‬Conduct‭ ‬in‭ ‬all‭ ‬community‭ ‬venues‭—‬online‭ ‬and‭ ‬in-
-person‭—‬as‭ ‬well‭ ‬as‭ ‬in‭ ‬all‭ ‬one-on-one‭ ‬communications‭ ‬pertaining‭
-‬to‭ ‬community‭ ‬business.
+We expect all community participants (contributors, paid or
+otherwise; sponsors; and other guests) to abide by this
+Code of Conduct in all community venues—online and in-
+person—as well as in all one-on-one communications pertaining
+to community business.
 
-## 9.‎ ‏Contact‭ ‬info
+## 9. Contact info
 
-‎[‏YOUR‭ ‬CONTACT‭ ‬INFO‭ ‬HERE‭ ‬--‭ ‬this‭ ‬should‭ ‬be‭ ‬a‭ ‬single‭
-‬person‭ ‬or‭ ‬a‭ ‬small‭ ‬team‭ ‬who‭ ‬can‭ ‬respond‭ ‬to‭ ‬issues‭
-‬directly‭]
+[YOUR_CONTACT_INFO_HERE -- this should be a single
+person or a small team who can respond to issues
+directly]
 
-## 10.‎ ‏License‭ ‬and‭ ‬attribution
+## 10. License and attribution
 
-This‭ ‬Code‭ ‬of‭ ‬Conduct‭ ‬is‭ ‬distributed‭ ‬under‭ ‬a‭ ‬[Creative‭
-‬Commons‭ ‬Attribution-ShareAlike‭ ‬license](http://creativecommons.org/licenses/by-sa/3.0/)
+This Code of Conduct is distributed under a [Creative
+Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/)
 
 _Revision 2.0, adopted by the [Stumptown
-Syndicate](http://stumptownsyndicate.org) board on 10 January 2013. Posted 17 March 2013._
+Syndicate](http://stumptownsyndicate.org) board on 10 January 2013. Posted 17 March 2013._