coconductor 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5c5ff9d7faba7e4fdad45cacddaffcfee361aaa1382f2d607b846959d1547a0
-  data.tar.gz: a453031ce32a2926e4695b03611b4a538bc23009f06f6ca7183367abb0c3a468
+  metadata.gz: 3eafd4cc42d0ae8f243b537cfdaf5f6f90490c5396cbe9cdcb5fc7881b1861ca
+  data.tar.gz: f6b2aa5e53f4b244482bfe35c650b8b85e8dd0b5d4d5723cbbf81ee2554c0570
 SHA512:
-  metadata.gz: c59d42852ddfb4c84fba34b895e0bcb691f14833d15447c5b189d6a9485876ce338f7359e1bce8b9047ccd33f3a1b3464413fc3f25dd77a2334ef90aaea8af83
-  data.tar.gz: ccc6b1b5b353e6c9601d4dcc85ead0826c83494dbc8c683e37562bf0c4603b8d1a261bc5ec0f2465b03a9b64555e748fc7b602411d920f6052e8b07f00774091
+  metadata.gz: 9f9041f1eea351ee08165d2b301c01bd59debe05eea9162a3f1fba024c85c136bf3b777882628f356986dc95ff80cfa67544d998d32533aa468cb1ecb1d6a1ce
+  data.tar.gz: 115db7930af3f7b311129d0ead425d006187c3c77e2052cf4fb8f82da030f33d3b4ded99820d88e89b2ec054b5e73531302ed40fba88910b4d3a58369d6e7f6a

data/.rubocop.yml

@@ -9,6 +9,7 @@ Metrics/LineLength:
   Exclude:
     - lib/coconductor/project_files.rb
     - lib/coconductor/commands/*
+    - script/vendor-codes-of-conduct
 
 Metrics/ClassLength:
   Exclude:
@@ -29,4 +30,3 @@ Metrics/AbcSize:
 Metrics/MethodLength:
   Exclude:
     - lib/coconductor/commands/*
-  

data/README.md

@@ -72,6 +72,8 @@ Content hash:     627827ddda36b5c42b3a00418d3d7d5b16e5088a
 
 * Contributor Covenant (all official languages and versions)
 * Citizen Code of Conduct (all versions)
+* The No Code of Conduct (latest version)
+* Geek Feminism Code of Conduct (latest long and short form versions)
 
 ### Matching strategy
 

data/lib/coconductor/code_of_conduct.rb

@@ -31,7 +31,10 @@ module Coconductor
           path = Pathname.new(path)
           key = path.relative_path_from(vendor_dir)
           matches = KEY_REGEX.match(key.to_path)
-          matches.to_a.compact[1..-1].insert(1, 'version').join('/') if matches
+          next unless matches
+          [
+            matches['family'], 'version', matches['version'], matches['lang']
+          ].compact.join('/')
         end.compact
       end
 
@@ -39,7 +42,7 @@ module Coconductor
         cocs = all.select do |coc|
           coc.language == language && coc.family == family
         end
-        cocs.max_by(&:version)
+        cocs.max_by { |c| c.geek_feminism? ? !c.version : c.version }
       end
 
       def families
@@ -62,7 +65,7 @@ module Coconductor
     KEY_REGEX = %r{
       (?<family>#{Regexp.union(CodeOfConduct.families)})
       /version
-      /(?<major>\d)/(?<minor>\d)(/(?<patch>\d))?
+      /(?<version>(?<major>\d)/(?<minor>\d)(/(?<patch>\d))?|(longer|shorter))
       /#{Coconductor::ProjectFiles::CodeOfConductFile::FILENAME_REGEX}
     }ix
     DEFAULT_LANGUAGE = 'en'.freeze
@@ -71,6 +74,12 @@ module Coconductor
     attr_writer :content
     include Licensee::ContentHelper
 
+    # Define dynamic predicate helpers to determine if a code of conduct is a
+    # member of a given family, e.g., code_of_conduct.contributor_covenant?
+    CodeOfConduct.families.each do |f|
+      define_method(f.tr('-', '_') + '?') { family == f }
+    end
+
     def initialize(key)
       @key = key
     end
@@ -127,18 +136,6 @@ module Coconductor
       @family ||= key.split('/').first unless none?
     end
 
-    def contributor_covenant?
-      family == 'contributor-covenant'
-    end
-
-    def citizen_code_of_conduct?
-      family == 'citizen-code-of-conduct'
-    end
-
-    def no_code_of_conduct?
-      family == 'no-code-of-conduct'
-    end
-
     # The "other" code of conduct represents an unidentifiable code of conduct
     def other?
       key == 'other'

data/lib/coconductor/version.rb

@@ -1,3 +1,3 @@
 module Coconductor
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/script/vendor-codes-of-conduct

@@ -9,16 +9,20 @@ def mkdir(dir)
   FileUtils.mkdir_p(dir)
 end
 
-def download_and_write(url, version: '1.0', dir: '', file: 'CODE_OF_CONDUCT.md')
-  content = URI.open(url).read
+def write_with_meta(content, version: '1.0', dir: '', file: 'CODE_OF_CONDUCT.md')
   meta = { 'version' => version }
-  toml = TOML::Generator.new(meta).body
-  content = ['+++', toml, '+++', content].join("\n")
+  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
+
 repo = 'ContributorCovenant/contributor_covenant'
 dir = File.expand_path '../vendor/contributor-covenant', __dir__
 include_path = '*/content/version'
@@ -53,3 +57,17 @@ 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'
+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]
+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)

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

@@ -1,7 +1,7 @@
 +++
 version = "2.0"
-
 +++
+
 # Citizen Code of Conduct
 
 ## 1.‭ ‬Purpose

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

@@ -1,7 +1,7 @@
 +++
 version = "2.1"
-
 +++
+
 # Citizen Code of Conduct
 
 ## 1. Purpose

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

@@ -1,7 +1,7 @@
 +++
 version = "2.2"
-
 +++
+
 # Citizen Code of Conduct
 
 ## 1. Purpose

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

@@ -1,7 +1,7 @@
 +++
 version = "2.3"
-
 +++
+
 # Citizen Code of Conduct
 
 ## 1. Purpose

data/vendor/geek-feminism/version/longer/CODE_OF_CONDUCT.md

@@ -0,0 +1,52 @@
++++
+version = "longer"
++++
+
+[COMMUNITY_NAME] is dedicated to providing a harassment-free experience for everyone. We do not tolerate harassment of participants in any form.
+
+This code of conduct applies to all [COMMUNITY_NAME] spaces, including [give a list of your spaces, eg "our mailing lists and IRC channel"], both online and off. Anyone who violates this code of conduct may be sanctioned or expelled from these spaces at the discretion of the [RESPONSE_TEAM].
+
+Some [COMMUNITY_NAME] spaces may have additional rules in place, which will be made clearly available to participants. Participants are responsible for knowing and abiding by these rules.
+
+Harassment includes:
+*Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, neuro(a)typicality, physical appearance, body size, age, race, or religion.
+*Unwelcome comments regarding a person’s lifestyle choices and practices, including those related to food, health, parenting, drugs, and employment.
+*Deliberate misgendering or use of ‘dead’ or rejected names.
+*Gratuitous or off-topic sexual images or behaviour  in spaces where they’re not appropriate.
+*Physical contact and simulated physical contact (eg, textual descriptions like “*hug*” or “*backrub*”) without consent or after a request to stop.
+*Threats of violence.
+*Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm.
+*Deliberate intimidation.
+*Stalking or following.
+*Harassing photography or recording, including logging online activity for harassment purposes.
+*Sustained disruption of discussion.
+*Unwelcome sexual attention.
+*Pattern of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others
+*Continued one-on-one communication after requests to cease.
+*Deliberate “outing” of any aspect of a person’s identity without their consent except as necessary to protect vulnerable people from intentional abuse.
+*Publication of non-harassing private communication.
+[COMMUNITY_NAME] prioritizes marginalized people’s safety over privileged people’s comfort. [RESPONSE_TEAM] reserves the right not to act on complaints regarding:
+*‘Reverse’ -isms, including ‘reverse racism,’ ‘reverse sexism,’ and ‘cisphobia’
+*Reasonable communication of boundaries, such as “leave me alone,” “go away,” or “I’m not discussing this with you.”
+*Communicating in a ‘tone’ you don’t find congenial
+*Criticizing racist, sexist, cissexist, or otherwise oppressive behavior or assumptions
+====Reporting====
+If you are being harassed by a member of [COMMUNITY_NAME], notice that someone else is being harassed, or have any other concerns, please contact the [RESPONSE_TEAM] at [email address or other contact point]. If the person who is harassing you is on the team, they will recuse themselves from handling your incident. We will respond as promptly as we can.
+
+This code of conduct applies to [COMMUNITY_NAME] spaces, but if you are being harassed by a member of [COMMUNITY_NAME] outside our spaces, we still want to know about it. We will take all good-faith reports of harassment by [COMMUNITY_NAME] members, especially [LEADERSHIP_TEAM], seriously. This includes harassment outside our spaces and harassment that took place at any point in time. The abuse team reserves the right to exclude people from [COMMUNITY_NAME] based on their past behavior, including behavior outside [COMMUNITY_NAME] spaces and behavior towards people who are not in [COMMUNITY_NAME].
+
+In order to protect volunteers from abuse and burnout, we reserve the right to reject any report we believe to have been made in bad faith. Reports intended to silence legitimate criticism may be deleted without response.
+
+We will respect confidentiality requests for the purpose of protecting victims of abuse. At our discretion, we may publicly name a person about whom we’ve received harassment complaints, or privately warn third parties about them, if we believe that doing so will increase the safety of [COMMUNITY_NAME] members or the general public. We will not name harassment victims without their affirmative consent.
+====Consequences====
+Participants asked to stop any harassing behavior are expected to comply immediately.
+
+If a participant engages in harassing behavior, [RESPONSE_TEAM] may take any action they deem appropriate, up to and including expulsion from all [COMMUNITY_NAME] spaces and identification of the participant as a harasser to other [COMMUNITY_NAME] members or the general public.
+
+==License and attribution==
+This policy is licensed under the [http://creativecommons.org/publicdomain/zero/1.0/ Creative Commons Zero license] . It is '''public domain''''', ''no credit and no open licencing of your version is required.
+
+If you would like to optionally attribute it, you could use the below text and link to http://geekfeminism.wikia.com/wiki/Community_anti-harassment:
+:This anti-harassment policy is based on the example policy from the Geek Feminism wiki, created by the Geek Feminism community.
+
+The policy is based on the [[Conference anti-harassment/Policy|conference anti-harassment policy]], and is the work of Annalee Flower Horne with assistance from Valerie Aurora, Alex Skud Bayley, Tim Chevalier, and Mary Gardiner.

data/vendor/geek-feminism/version/shorter/CODE_OF_CONDUCT.md

@@ -0,0 +1,9 @@
++++
+version = "shorter"
++++
+
+[COMMUNITY_NAME] is dedicated to providing a harassment-free experience for everyone, regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, age, race, or religion. We do not tolerate harassment of participants in any form.
+
+This code of conduct applies to all [COMMUNITY_NAME] spaces, including [list, eg "our mailing lists and IRC channel"], both online and off. Anyone who violates this code of conduct may be sanctioned or expelled from these spaces at the discretion of the [RESPONSE_TEAM].
+
+Some [COMMUNITY_NAME] spaces may have additional rules in place, which will be made clearly available to participants. Participants are responsible for knowing and abiding by these rules.

data/vendor/no-code-of-conduct/version/1/0/CODE_OF_CONDUCT.md

@@ -1,7 +1,7 @@
 +++
 version = "1.0"
-
 +++
+
 # Contributor Code of Conduct
 
 This project adheres to No Code of Conduct.  We are all adults.  We accept anyone's contributions.  Nothing else matters.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coconductor
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: licensee
@@ -227,6 +227,8 @@ files:
 - vendor/contributor-covenant/version/1/4/code-of-conduct.uk.md
 - vendor/contributor-covenant/version/1/4/code-of-conduct.zh-cn.md
 - vendor/contributor-covenant/version/1/4/code-of-conduct.zh-tw.md
+- vendor/geek-feminism/version/longer/CODE_OF_CONDUCT.md
+- vendor/geek-feminism/version/shorter/CODE_OF_CONDUCT.md
 - vendor/no-code-of-conduct/version/1/0/CODE_OF_CONDUCT.md
 homepage: https://github.com/benbalter/coconductor
 licenses: